From e9950daf9ac10bf7a0f49ba0accd26bb318b2603 Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Tue, 18 Mar 2025 02:59:18 +0100 Subject: Un-hardcode --- .tools/downloadlib.sh | 7 ++++--- .tools/manaplus.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.tools/downloadlib.sh b/.tools/downloadlib.sh index 3c77fa6d..b93461dd 100755 --- a/.tools/downloadlib.sh +++ b/.tools/downloadlib.sh @@ -1,7 +1,8 @@ #!/bin/bash export zipname="lib.zip" -export libname="$1_$2" +export branch="$1" +export libname="$2_$3" mkdir libdownload cd libdownload @@ -10,7 +11,7 @@ rm "${zipname}" wget --retry-connrefused --retry-on-host-error --tries=10 --waitretry=5 \ -O "$zipname" \ --progress=dot:mega \ - "https://git.themanaworld.org/mana/spm/builds/artifacts/packetver24/download?job=${libname}" + "https://git.themanaworld.org/mana/spm/builds/artifacts/$branch/download?job=$libname" unzip "${zipname}" cp -r "bin/${libname}" .. @@ -22,6 +23,6 @@ mkdir -p /usr/local/spm/bin cp -r libdownload/bin/${libname} /usr/local/spm/bin/ ls /usr/local/spm/bin/${libname} if [ "$?" != 0 ]; then - echo "Library $1 $2 unpack failed" + printf "Library %s %s %s unpack failed" "$1" "$2" "$3" exit 1 fi diff --git a/.tools/manaplus.sh b/.tools/manaplus.sh index 60a58b84..d8446179 100755 --- a/.tools/manaplus.sh +++ b/.tools/manaplus.sh @@ -14,7 +14,7 @@ aptget_install \ pwd ls -./clientdata/.tools/downloadlib.sh manaplus s20180215 || exit 1 +./clientdata/.tools/downloadlib.sh packetver24 manaplus s20180215 || exit 1 export HOME=`pwd`/clientdata/shared -- cgit v1.2.3-70-g09d2