From c4ce2f10cd1076136f4a16c677738309f16bb301 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Wed, 12 Apr 2023 21:14:33 -0400 Subject: build/package/ship `soh.otr` (#2699) * update * Update generate-builds.yml * Update generate-builds.yml * sohotr in CI? * paths * gitignore soh.otr * Fix * no COMMAND maybe? * try generating otr as it's own step * deps * f * g * h * a * cc * ccc * m * blarg * try uploading * try * s * copy things * wii u? * wiiu * don't fail * windows without cpack? * wut * whoops * see all the things plz * b * v * zip working maybe * ok but this tho * pdb and switch * mac lus * soh.otr in appimage * down first * mac * bundle soh otr into mac app and read it from the bundle * appimage fix * try just downloading for mac? * i like to mv it mv it * mv to the right place * no more otrgui * bring back otrgui and assets * echo blarg * echo * zapd.exe * clean and remove * a * space --------- Co-authored-by: louis Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> Co-authored-by: briaguya Co-authored-by: Adam Bird --- scripts/linux/appimage/soh.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts/linux') diff --git a/scripts/linux/appimage/soh.sh b/scripts/linux/appimage/soh.sh index 384311d4c..b8de73641 100644 --- a/scripts/linux/appimage/soh.sh +++ b/scripts/linux/appimage/soh.sh @@ -9,6 +9,10 @@ if [ -z ${SHIP_HOME+x} ]; then export SHIP_HOME=$PWD fi +if [ -z ${SHIP_BIN_DIR+x} ]; then +export SHIP_BIN_DIR="$HERE/usr/bin" +fi + while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do for romfile in "$SHIP_HOME"/*.*64 do @@ -95,10 +99,10 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do rm -r "$ASSETDIR" exit else - (cd "$HERE/usr/bin"; ./soh.elf) + (cd "$SHIP_BIN_DIR"; ./soh.elf) exit fi rm -r "$ASSETDIR" done - (cd "$HERE/usr/bin"; ./soh.elf) + (cd "$SHIP_BIN_DIR"; ./soh.elf) exit -- cgit v1.2.3