Author: DuckSoft I just cannot stand such a dirty package. Let me do some optimisations. If you are interested to improve this patch, welcome to mail me. diff -rup old/tool/ventoy_lib.sh new/tool/ventoy_lib.sh --- tool/ventoy_lib.sh 2021-12-02 16:59:42.148650182 +0100 +++ tool/ventoy_lib.sh 2021-12-02 17:01:17.214720518 +0100 @@ -29,7 +29,7 @@ vterr() { } vtdebug() { - echo "$*" >> ./log.txt + echo "$*" >>/var/log/ventoy.log } vtoy_gen_uuid() { @@ -52,30 +52,6 @@ vtoy_gen_uuid() { check_tool_work_ok() { - if echo 1 | hexdump > /dev/null; then - vtdebug "hexdump test ok ..." - else - vtdebug "hexdump test fail ..." - ventoy_false - return - fi - - if mkexfatfs -V > /dev/null; then - vtdebug "mkexfatfs test ok ..." - else - vtdebug "mkexfatfs test fail ..." - ventoy_false - return - fi - - if vtoycli fat -T; then - vtdebug "vtoycli fat test ok ..." - else - vtdebug "vtoycli fat test fail ..." - ventoy_false - return - fi - vtdebug "tool check success ..." ventoy_true } @@ -311,7 +287,7 @@ format_ventoy_disk_mbr() { else vtdebug "format disk by fdisk ..." -fdisk $DISK >>./log.txt 2>&1 <>/var/log/ventoy.log 2>&1 <> ./log.txt -date >> ./log.txt - -#decompress tool -echo "decompress tools" >> ./log.txt -cd ./tool/$TOOLDIR - -ls *.xz > /dev/null 2>&1 -if [ $? -eq 0 ]; then - [ -f ./xzcat ] && chmod +x ./xzcat - - for file in $(ls *.xz); do - echo "decompress $file" >> ./log.txt - xzcat $file > ${file%.xz} - [ -f ./${file%.xz} ] && chmod +x ./${file%.xz} - [ -f ./$file ] && rm -f ./$file - done -fi - -cd ../../ -chmod +x -R ./tool/$TOOLDIR - - -if [ -f /bin/bash ]; then - /bin/bash ./tool/VentoyWorker.sh $* -else - ash ./tool/VentoyWorker.sh $* -fi - -if [ -n "$OLDDIR" ]; then - CURDIR=$(pwd) - if [ "$CURDIR" != "$OLDDIR" ]; then - cd "$OLDDIR" - fi -fi +./tool/VentoyWorker.sh $* diff -rup old/VentoyPlugson.sh new/VentoyPlugson.sh --- VentoyPlugson.sh 2021-12-02 17:54:36.055868878 +0100 +++ VentoyPlugson.sh 2021-12-02 18:04:40.919633986 +0100 @@ -25,8 +19,6 @@ if echo $machine | egrep -q 'aarch64|arm TOOLDIR=aarch64 elif echo $machine | egrep -q 'x86_64|amd64'; then TOOLDIR=x86_64 -elif echo $machine | egrep -q 'mips64'; then - TOOLDIR=mips64el elif echo $machine | egrep -q 'i[3-6]86'; then TOOLDIR=i386 else @@ -35,38 +27,6 @@ else fi -if ! [ -f "$OLDDIR/tool/plugson.tar.xz" ]; then - echo "Please run under the correct directory!" - exit 1 -fi - -echo "############# VentoyPlugson $* [$TOOLDIR] ################" >> ./VentoyPlugson.log -date >> ./VentoyPlugson.log - -echo "decompress tools" >> ./VentoyPlugson.log -cd ./tool/$TOOLDIR - -ls *.xz > /dev/null 2>&1 -if [ $? -eq 0 ]; then - [ -f ./xzcat ] && chmod +x ./xzcat - - for file in $(ls *.xz); do - echo "decompress $file" >> ./VentoyPlugson.log - xzcat $file > ${file%.xz} - [ -f ./${file%.xz} ] && chmod +x ./${file%.xz} - [ -f ./$file ] && rm -f ./$file - done -fi - -cd ../../ -chmod +x -R ./tool/$TOOLDIR - -if ! [ -f "$OLDDIR/tool/$TOOLDIR/Plugson" ]; then - echo "$OLDDIR/tool/$TOOLDIR/Plugson does not exist!" - exit 1 -fi - - PATH=./tool/$TOOLDIR:$PATH HOST="127.0.0.1" @@ -208,11 +168,3 @@ if [ -f /proc/$wID/maps ]; then wait $wID fi - - -if [ -n "$OLDDIR" ]; then - CURDIR=$(pwd) - if [ "$CURDIR" != "$OLDDIR" ]; then - cd "$OLDDIR" - fi -fi diff -rup old/VentoyWeb.sh new/VentoyWeb.sh --- VentoyWeb.sh 2021-12-02 16:58:51.885612627 +0100 +++ VentoyWeb.sh 2021-12-02 17:04:43.437871014 +0100 @@ -15,12 +15,6 @@ print_err() { echo "" } -uid=$(id -u) -if [ $uid -ne 0 ]; then - print_err "Please use sudo or run the script as root." - exit 1 -fi - OLDDIR=$(pwd) if uname -m | egrep -q 'aarch64|arm64'; then @@ -85,8 +79,8 @@ if ps -ef | grep "V2DServer.*$HOST.*$POR exit 1 fi -LOGFILE=log.txt -#delete the log.txt if it's more than 8MB +LOGFILE=/var/log/ventoy.log +#delete the ventoy.log if it's more than 8MB if [ -f $LOGFILE ]; then logsize=$(stat -c '%s' $LOGFILE) if [ $logsize -gt 8388608 ]; then