X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/ebaa4d954aa0b3d70f14b2fd6fec63df1599b8ce..32bcd8f87b481e41ee6a78a4a6c8c24b71288e0f:/INSTALL/Ventoy2Disk.sh diff --git a/INSTALL/Ventoy2Disk.sh b/INSTALL/Ventoy2Disk.sh index f45bec8..5b1d6f4 100644 --- a/INSTALL/Ventoy2Disk.sh +++ b/INSTALL/Ventoy2Disk.sh @@ -1,5 +1,7 @@ #!/bin/sh +OLDDIR=$(pwd) + if ! [ -f ./tool/ventoy_lib.sh ]; then if [ -f ${0%Ventoy2Disk.sh}/tool/ventoy_lib.sh ]; then cd ${0%Ventoy2Disk.sh} @@ -10,12 +12,12 @@ if [ -f ./ventoy/version ]; then curver=$(cat ./ventoy/version) fi -OLDDIR=$(pwd) - -if uname -a | egrep -q 'aarch64|arm64'; then +if uname -m | egrep -q 'aarch64|arm64'; then export TOOLDIR=aarch64 -elif uname -a | egrep -q 'x86_64|amd64'; then +elif uname -m | egrep -q 'x86_64|amd64'; then export TOOLDIR=x86_64 +elif uname -m | egrep -q 'mips64'; then + export TOOLDIR=mips64el else export TOOLDIR=i386 fi @@ -53,9 +55,10 @@ else for file in $(ls *.xz); do xzcat $file > ${file%.xz} + [ -f ./${file%.xz} ] && chmod +x ./${file%.xz} [ -f ./$file ] && rm -f ./$file done - cd $OLDDIR + cd ../../ chmod +x -R ./tool/$TOOLDIR fi @@ -67,7 +70,8 @@ else fi if [ -n "$OLDDIR" ]; then - cd $OLDDIR + CURDIR=$(pwd) + if [ "$CURDIR" != "$OLDDIR" ]; then + cd "$OLDDIR" + fi fi - -