From d4dc0ffee19ccc29764dff2f8e298a632eab2c7c Mon Sep 17 00:00:00 2001 From: h0neybadger Date: Sat, 2 Jan 2021 13:23:14 +0100 Subject: [PATCH] Fix switch README info and nxlink push script --- scripts/switch/push-docker-build-chiaki.sh | 10 ++++++---- switch/README.md | 20 ++------------------ 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/scripts/switch/push-docker-build-chiaki.sh b/scripts/switch/push-docker-build-chiaki.sh index ff66e40..ac82029 100755 --- a/scripts/switch/push-docker-build-chiaki.sh +++ b/scripts/switch/push-docker-build-chiaki.sh @@ -3,8 +3,10 @@ cd "`dirname $(readlink -f ${0})`/../.." docker run \ - -v "`pwd`:/build/chiaki" \ - -p 28771:28771 -ti \ - chiaki-switch \ - -c "/opt/devkitpro/tools/bin/nxlink -a $@ -s /build/chiaki/build_switch/switch/chiaki.nro" + -v "`pwd`:/build/chiaki" \ + -w "/build/chiaki" \ + -ti -p 28771:28771 \ + --entrypoint /opt/devkitpro/tools/bin/nxlink \ + thestr4ng3r/chiaki-build-switch \ + "$@" -s /build/chiaki/build_switch/switch/chiaki.nro diff --git a/switch/README.md b/switch/README.md index 709f900..f5fbe68 100644 --- a/switch/README.md +++ b/switch/README.md @@ -4,22 +4,6 @@ this project requires the devkitpro toolchain. you can use your personal computer to install devkitpro but the easiest way is to use the following container. -Build container image ---------------------- -``` -bash scripts/switch/build-docker-image.sh -``` - -Run container -------------- -from the project's [root folder](../) -``` -docker run -it --rm \ - -v "$(pwd):/build" \ - -p 28771:28771 \ - chiaki-switch -``` - Build Project ------------- ``` @@ -31,7 +15,7 @@ tools Push to homebrew Netloader ``` # where X.X.X.X is the IP of your switch -scripts/switch/push-docker-build-chiaki.sh 192.168.0.200 +bash scripts/switch/push-docker-build-chiaki.sh -a 192.168.0.200 ``` Troubleshoot @@ -52,7 +36,7 @@ this file contains sensitive data. (do not share this file) [PS*-***] # required: lan PlayStation IP address # IP from Settings > System > system information -host_ip = *.*.*.* +host_addr = *.*.*.* # required: sony oline id (login) psn_online_id = ps_online_id # required (PS4>7.0 Only): https://git.sr.ht/~thestr4ng3r/chiaki/tree/master/item/README.md#obtaining-your-psn-accountid