diff --git a/appimage/appimage.sh b/appimage/appimage.sh index 42c54576a..2914d0ae6 100755 --- a/appimage/appimage.sh +++ b/appimage/appimage.sh @@ -6,7 +6,8 @@ curl -sSfLO "https://github.com/AppImage/AppImageKit/releases/download/continuou chmod a+x appimagetool*.AppImage mkdir -p AppDir/usr/bin -cp appimage/{soh.desktop,soh.png,soh.sh} AppDir/ +cp appimage/{soh.desktop,soh.sh} AppDir/ +cp soh/macosx/sohIcon.png AppDir/soh.png curl -sSfL https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt -o AppDir/usr/bin/gamecontrollerdb.txt mkdir -p AppDir/usr/share/applications @@ -20,18 +21,14 @@ chmod +x AppDir/usr/bin/{soh.elf,OTRGui,soh.sh} cd AppDir && ln -s ./usr/bin/soh.sh ./AppRun && cd .. -export UPD_INFO="gh-releases-zsync|HarbourMasters|Shipwright-linux|zelda64|SOH-Linux.AppImage.zsync" +export UPD_INFO="gh-releases-zsync|HarbourMasters|Shipwright-linux|develop|SOH-Linux.AppImage.zsync" ./linuxdeploy-x86_64.AppImage --appimage-extract-and-run \ --appdir=./AppDir/ \ -d ./AppDir/soh.desktop \ -i ./AppDir/soh.png \ - -e ./AppDir/usr/bin/soh.elf \ - -e ./AppDir/usr/bin/assets/extractor/ZAPD.out - -mv ./AppDir/usr/bin/ZAPD.out ./AppDir/usr/bin/assets/extractor/ZAPD.out -cd ./AppDir/usr/bin/assets/extractor/ -patchelf --set-rpath "\$ORIGIN/../../../lib" ZAPD.out + -e ./AppDir/usr/bin/soh.elf + cd /soh -./appimagetool-x86_64.AppImage --appimage-extract-and-run ./AppDir "SOH-Linux.AppImage" -u "gh-releases-zsync|HarbourMasters|Shipwright-linux|zelda64|SOH-Linux.AppImage.zsync" +./appimagetool-x86_64.AppImage --appimage-extract-and-run ./AppDir "SOH-Linux.AppImage" diff --git a/appimage/soh.png b/appimage/soh.png deleted file mode 100644 index b9343dd9b..000000000 Binary files a/appimage/soh.png and /dev/null differ diff --git a/appimage/soh.sh b/appimage/soh.sh index 29a7841c4..bd4683e50 100644 --- a/appimage/soh.sh +++ b/appimage/soh.sh @@ -1,19 +1,19 @@ #!/bin/bash HERE="$(dirname "$(readlink -f "${0}")")"/../.. -export PATH=$HERE/bin:$HERE/usr/bin:$PATH +export PATH="$HERE"/bin:"$HERE"/usr/bin:"$PATH" -while [[ ! -e $PWD/oot.otr ]]; do - export ASSETDIR=$(mktemp -d /tmp/assets-XXXXX) - ln -s $HERE/usr/bin/{assets,soh.elf,OTRGui} $ASSETDIR - export OLDPWD=$PWD - mkdir -p $ASSETDIR/tmp - mkdir -p $ASSETDIR/Extract/assets - if [ -e $PWD/*.*64 ]; then - ln -s $OLDPWD/*.*64 $ASSETDIR/tmp/rom.z64 - cp -r $ASSETDIR/assets/game/ship_of_harkinian $ASSETDIR/Extract/assets/ - cd $ASSETDIR - case $(sha1sum -b $ASSETDIR/tmp/rom.z64 | awk '{ print $1 }') in +while [[ ! -e "$PWD"/oot.otr ]]; do + export ASSETDIR="$(mktemp -d /tmp/assets-XXXXX)" + ln -s "$HERE"/usr/bin/{assets,soh.elf,OTRGui} "$ASSETDIR" + export OLDPWD="$PWD" + mkdir -p "$ASSETDIR"/tmp + mkdir -p "$ASSETDIR"/Extract/assets + if [ -e "$PWD"/*.*64 ]; then + ln -s "$OLDPWD"/*.*64 "$ASSETDIR"/tmp/rom.z64 + cp -r "$ASSETDIR"/assets/game/ship_of_harkinian "$ASSETDIR"/Extract/assets/ + cd "$ASSETDIR" + case $(sha1sum -b "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }') in cee6bc3c2a634b41728f2af8da54d9bf8cc14099) ROM=GC_NMQ_D;; 0227d7c0074f2d0ac935631990da8ec5914597b4) @@ -23,8 +23,8 @@ while [[ ! -e $PWD/oot.otr ]]; do exit;; esac echo "Processing..." - assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/${ROM} -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_${ROM}.xml -se OTR > /dev/null 2>&1 - cp "$ASSETDIR"/oot.otr $OLDPWD + assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR > /dev/null 2>&1 + cp "$ASSETDIR"/oot.otr "$OLDPWD" echo "Restart $APPIMAGE to play!" sleep 3 rm -r "$ASSETDIR" @@ -34,8 +34,8 @@ while [[ ! -e $PWD/oot.otr ]]; do exit fi done - cd $OWD - ln -s "$HERE/usr/bin/gamecontrollerdb.txt" $PWD - "$HERE/usr/bin/soh.elf" - unlink $PWD/gamecontrollerdb.txt + cd "$OWD" + ln -s "$HERE"/usr/bin/gamecontrollerdb.txt "$PWD" + "$HERE"/usr/bin/soh.elf + unlink "$PWD"/gamecontrollerdb.txt exit