Skip to content

Commit d47f2d8

Browse files
Merge pull request #185 from slaw-22/FixDevcontainerSetup
Fix Devcontainer setup by referencing the same NitroSDK filename throughout.
2 parents 7e20d92 + 2bb9e10 commit d47f2d8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.devcontainer/onCreate.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ if [ ! -d "$WORKSPACE/tools/bin" \
1616
-o ! -f "$WORKSPACE/ARM9-TS.lcf.template" \
1717
-o ! -f "$WORKSPACE/mwldarm.response.template" ]; then
1818
wget https://github.com/pret/pmd-sky/raw/workflows/assets/NitroSDK-4_2-071210-jp.7z
19-
7z x NitroSDK-3_2-060901.7z
19+
7z x NitroSDK-4_2-071210-jp.7z -oNitroSDK-4_2-071210-jp
2020
rm -rf "$WORKSPACE/tools/bin"
21-
mv -v NitroSDK-3_2-060901/tools/bin "$WORKSPACE/tools"
22-
mv -v NitroSDK-3_2-060901/include/nitro/specfiles/ARM7-TS.lcf.template "$WORKSPACE/sub/"
23-
mv -v NitroSDK-3_2-060901/include/nitro/specfiles/ARM9-TS.lcf.template "$WORKSPACE/"
24-
mv -v NitroSDK-3_2-060901/include/nitro/specfiles/mwldarm.response.template "$WORKSPACE/"
21+
mv -v NitroSDK-4_2-071210-jp/tools/bin "$WORKSPACE/tools"
22+
mv -v NitroSDK-4_2-071210-jp/include/nitro/specfiles/ARM7-TS.lcf.template "$WORKSPACE/sub/"
23+
mv -v NitroSDK-4_2-071210-jp/include/nitro/specfiles/ARM9-TS.lcf.template "$WORKSPACE/"
24+
mv -v NitroSDK-4_2-071210-jp/include/nitro/specfiles/mwldarm.response.template "$WORKSPACE/"
2525
fi
2626

2727
# Set up wine under a virtual X11 server to hide the annoying GUI popup.

0 commit comments

Comments
 (0)