joshenders · April 1, 2025 14:05 · Nov 24, 2023 · Nov 23, 2023 · Nov 23, 2023 · Nov 23, 2023
diff --git a/catalina_devkitpro_setup.md → devkitpro_setup_macos.md b/catalina_devkitpro_setup.md → devkitpro_setup_macos.md
@@ -72,10 +72,6 @@ You should now have a file in the current directory called `example.nro`.
 
    ![example](https://i.imgur.com/xPsvWfR.jpg)
 
-## Acknowledgements
-
-Huge thanks to <https://devkitpro.org> for making this process so easy. Follow them on [Twitter](https://twitter.com/devkitpro) and support them on [Patreon](http://patreon.com/devkitPro)
-
 ## License
 
 This work is licensed under CC BY-NC version 4.0 <https://creativecommons.org/licenses/by-nc/4.0/> © 2020, Josh Enders. Some Rights Reserved.
diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -8,7 +8,7 @@ xcode-select --install
 
 ## Install the devkitpro Package Manager
 
-1. Download the latest [devkitpro-macpman-installer.pkg](https://github.com/devkitPro/pacman/releases/latest) from the GitHub releases page.
+1. Download the latest [devkitpro-pacman-installer.pkg](https://github.com/devkitPro/pacman/releases/latest) from the GitHub releases page.
 2. Install it with:
 
    ```sh

diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -8,7 +8,7 @@ xcode-select --install
 
 ## Install the devkitpro Package Manager
 
-1. Download the latest [dekitpro-macpman-installer.pkg](https://github.com/devkitPro/pacman/releases/latest) from the GitHub releases page.
+1. Download the latest [devkitpro-macpman-installer.pkg](https://github.com/devkitPro/pacman/releases/latest) from the GitHub releases page.
 2. Install it with:
 
    ```sh

diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -8,7 +8,7 @@ xcode-select --install
 
 ## Install the devkitpro Package Manager
 
-1. Download the latest [dekitpro-macpman-installer.pkg](https://github.com/devkitPro/pacman/releases) from the GitHub releases page.
+1. Download the latest [dekitpro-macpman-installer.pkg](https://github.com/devkitPro/pacman/releases/latest) from the GitHub releases page.
 2. Install it with:
 
    ```sh

diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -12,7 +12,7 @@ xcode-select --install
 2. Install it with:
 
    ```sh
-   sudo installer -pkg /path/to/devkitpro-pacman.pkg -target /
+   sudo installer -pkg /path/to/devkitpro-pacman-installer.pkg -target /
    ```
 
 ## Install the libraries and tools for switch development

diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -15,16 +15,6 @@ xcode-select --install
    sudo installer -pkg /path/to/devkitpro-pacman.pkg -target /
    ```
 
-3. Update `RootDir` in `pacman.conf` to work around unresolved Catalina issue.
-
-   Catalina uses a unique partitioning scheme to ensure system integrity. As such, the root partition isn't writeable     and so we have to update the pacman configuration to accomodate for this.
-
-   Follow the GitHub issue here: <https://github.com/devkitPro/pacman/issues/15>
-
-   ```sh
-   sudo sed -i '' 's|^#RootDir\ *= /|RootDir     = /System/Volumes/Data|' /opt/devkitPro/pacman/etc/pacman.conf
-   ```
-
 ## Install the libraries and tools for switch development
 
 Install the `switch-dev` package group using `dkp-pacman`.
@@ -35,16 +25,13 @@ sudo dkp-pacman --noconfirm --sync switch-dev
 
 ## Update your shell runtime configuration
 
-1. Create `~/.bash_profile` or edit it if you have one already and add the following envrionment variables.
+1. Create `~/.bash_profile` or edit it if you have one already and add the following envrionment variables:
 
    ```sh
    export DEVKITPRO=/opt/devkitpro
-   export DEVKITARM=${DEVKITPRO}/devkitARM
-   export DEVKITPPC=${DEVKITPRO}/devkitPPC
-   ```
-
-   ```sh
-   export PATH=${DEVKITPRO}/tools/bin:$PATH
+   export DEVKITARM="${DEVKITPRO}/devkitARM"
+   export DEVKITPPC="${DEVKITPRO}/devkitPPC"
+   export PATH="${DEVKITPRO}/tools/bin:${PATH}"
    ```
 
 2. Source your updated `~/.bash_profile`

diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -85,7 +85,7 @@ You should now have a file in the current directory called `example.nro`.
 
    ![example](https://i.imgur.com/xPsvWfR.jpg)
 
-## Acknolwedgements
+## Acknowledgements
 
 Huge thanks to <https://devkitpro.org> for making this process so easy. Follow them on [Twitter](https://twitter.com/devkitpro) and support them on [Patreon](http://patreon.com/devkitPro)
 

diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -17,13 +17,13 @@ xcode-select --install
 
 3. Update `RootDir` in `pacman.conf` to work around unresolved Catalina issue.
 
-Catalina uses a unique partitioning scheme to ensure system integrity. As such, the root partition isn't writeable and so we have to update the pacman configuration to accomodate for this.
-
-Follow the GitHub issue here: <https://github.com/devkitPro/pacman/issues/15>
-
-```sh
-sudo sed -i '' 's|^#RootDir\ *= /|RootDir     = /System/Volumes/Data|' /opt/devkitPro/pacman/etc/pacman.conf
-```
+   Catalina uses a unique partitioning scheme to ensure system integrity. As such, the root partition isn't writeable     and so we have to update the pacman configuration to accomodate for this.
+   
+   Follow the GitHub issue here: <https://github.com/devkitPro/pacman/issues/15>
+   
+   ```sh
+   sudo sed -i '' 's|^#RootDir\ *= /|RootDir     = /System/Volumes/Data|' /opt/devkitPro/pacman/etc/pacman.conf
+   ```
 
 ## Install the libraries and tools for switch development
 
@@ -49,9 +49,9 @@ sudo dkp-pacman --noconfirm --sync switch-dev
 
 2. Source your updated `~/.bash_profile`
 
-```sh
-source ~/.bash_profile
-```
+   ```sh
+   source ~/.bash_profile
+   ```
 
 ## Your first build
 
@@ -83,7 +83,7 @@ You should now have a file in the current directory called `example.nro`.
 
 4. You should see your example code running.
 
-![example](https://i.imgur.com/xPsvWfR.jpg)
+   ![example](https://i.imgur.com/xPsvWfR.jpg)
 
 ## Acknolwedgements
 

diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -91,4 +91,4 @@ Huge thanks to <https://devkitpro.org> for making this process so easy. Follow t
 
 ## License
 
-This work is licensed under CC BY-NC version 4.0 https://creativecommons.org/licenses/by-nc/4.0/ © 2020, Josh Enders. Some Rights Reserved.
+This work is licensed under CC BY-NC version 4.0 <https://creativecommons.org/licenses/by-nc/4.0/> © 2020, Josh Enders. Some Rights Reserved.
diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -84,3 +84,11 @@ You should now have a file in the current directory called `example.nro`.
 4. You should see your example code running.
 
 ![example](https://i.imgur.com/xPsvWfR.jpg)
+
+## Acknolwedgements
+
+Huge thanks to <https://devkitpro.org> for making this process so easy. Follow them on [Twitter](https://twitter.com/devkitpro) and support them on [Patreon](http://patreon.com/devkitPro)
+
+## License
+
+This work is licensed under CC BY-NC version 4.0 https://creativecommons.org/licenses/by-nc/4.0/ © 2020, Josh Enders. Some Rights Reserved.
diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -1,4 +1,4 @@
-# Getting started with Nintendo Switch Development using devkitpro on macOS Catalina
+# Getting started with Nintendo Switch Development using devkitpro on macOS
 
 ## Prerequsite: Ensure Xcode command line tools are installed
 
@@ -47,7 +47,7 @@ sudo dkp-pacman --noconfirm --sync switch-dev
    export PATH=${DEVKITPRO}/tools/bin:$PATH
    ```
 
-2. Source your updated ~/.bash_profile`
+2. Source your updated `~/.bash_profile`
 
 ```sh
 source ~/.bash_profile

diff --git a/catalina_devkitpro_setup.md b/catalina_devkitpro_setup.md
@@ -0,0 +1,86 @@
+# Getting started with Nintendo Switch Development using devkitpro on macOS Catalina
+
+## Prerequsite: Ensure Xcode command line tools are installed
+
+```sh
+xcode-select --install
+```
+
+## Install the devkitpro Package Manager
+
+1. Download the latest [dekitpro-macpman-installer.pkg](https://github.com/devkitPro/pacman/releases) from the GitHub releases page.
+2. Install it with:
+
+   ```sh
+   sudo installer -pkg /path/to/devkitpro-pacman.pkg -target /
+   ```
+
+3. Update `RootDir` in `pacman.conf` to work around unresolved Catalina issue.
+
+Catalina uses a unique partitioning scheme to ensure system integrity. As such, the root partition isn't writeable and so we have to update the pacman configuration to accomodate for this.
+
+Follow the GitHub issue here: <https://github.com/devkitPro/pacman/issues/15>
+
+```sh
+sudo sed -i '' 's|^#RootDir\ *= /|RootDir     = /System/Volumes/Data|' /opt/devkitPro/pacman/etc/pacman.conf
+```
+
+## Install the libraries and tools for switch development
+
+Install the `switch-dev` package group using `dkp-pacman`.
+
+```sh
+sudo dkp-pacman --noconfirm --sync switch-dev
+```
+
+## Update your shell runtime configuration
+
+1. Create `~/.bash_profile` or edit it if you have one already and add the following envrionment variables.
+
+   ```sh
+   export DEVKITPRO=/opt/devkitpro
+   export DEVKITARM=${DEVKITPRO}/devkitARM
+   export DEVKITPPC=${DEVKITPRO}/devkitPPC
+   ```
+
+   ```sh
+   export PATH=${DEVKITPRO}/tools/bin:$PATH
+   ```
+
+2. Source your updated ~/.bash_profile`
+
+```sh
+source ~/.bash_profile
+```
+
+## Your first build
+
+Devkitpro comes with [example code](https://github.com/switchbrew/switch-examples) installed at `${DEVKITPRO}/examples`. You can use this code to test your toolchain or as a boiler plate for your first project.
+
+```sh
+cp -r "${DEVKITPRO}/examples/switch/templates/application" /tmp/example
+cd /tmp/example
+make
+```
+
+You should now have a file in the current directory called `example.nro`.
+
+## Using NetLoader and nxlink to test your build
+
+1. Launch the `hbmenu` using your favorite method. I'm partial to the [RCMLoader](https://www.xkit.xyz/rcmloader/) myself.
+
+   ![hbmenu](https://i.imgur.com/tRwZxGD.jpg)
+
+2. Ensure that your Switch is connected to Wifi (not in Airplane mode) and press 'Y' to start NetLoader
+
+   ![netloader](https://i.imgur.com/GJjFOci.jpg)
+
+3. In your build directory, run nxlink with the IP address shown on the NetLoader screen:
+
+   ```sh
+   nxlink --address 192.168.1.10 example.nro
+   ```
+
+4. You should see your example code running.
+
+![example](https://i.imgur.com/xPsvWfR.jpg)