1.0.37 release

diff --git a/IMG/cpio/ventoy/hook/manjaro/ventoy-disk.sh b/IMG/cpio/ventoy/hook/manjaro/ventoy-disk.sh
index c1765376d931e9d6774e6a99dabe4a5eeb386e86..e325eabf0160310296b5faa646b5125d5cff8192 100644 (file)
--- a/IMG/cpio/ventoy/hook/manjaro/ventoy-disk.sh
+++ b/IMG/cpio/ventoy/hook/manjaro/ventoy-disk.sh
@@ -59,7 +59,11 @@ else
         vtlog "vtLABEL is $vtLABEL from cmdline"
     fi
     
-    ln -s /dev/$vtDM "/dev/disk/by-label/$vtLABEL"
+    if [ -e "/dev/disk/by-label/$vtLABEL" ]; then
+        vtlog "/dev/disk/by-label/$vtLABEL already exist"
+    else
+        ln -s /dev/$vtDM "/dev/disk/by-label/$vtLABEL"
+    fi
 fi 
 
 # OK finish

diff --git a/IMG/mkcpio.sh b/IMG/mkcpio.sh
index 5daded7f4263c72144764301182104e919f068d6..0fc88bafe9652a1b9057647cb09e815c083e5bed 100644 (file)
--- a/IMG/mkcpio.sh
+++ b/IMG/mkcpio.sh
@@ -142,6 +142,12 @@ rm -rf cpio_tmp
 
 echo '======== SUCCESS ============='
 
-rm -f $VENTOY_PATH/INSTALL/ventoy/ventoy*.cpio
-cp -a ventoy*.cpio $VENTOY_PATH/INSTALL/ventoy/
+rm -f $VENTOY_PATH/INSTALL/ventoy/ventoy.cpio
+rm -f $VENTOY_PATH/INSTALL/ventoy/ventoy_x86.cpio
+rm -f $VENTOY_PATH/INSTALL/ventoy/ventoy_arm64.cpio
+rm -f $VENTOY_PATH/INSTALL/ventoy/ventoy_mips64.cpio
+cp -a ventoy.cpio $VENTOY_PATH/INSTALL/ventoy/
+cp -a ventoy_x86.cpio $VENTOY_PATH/INSTALL/ventoy/
+cp -a ventoy_arm64.cpio $VENTOY_PATH/INSTALL/ventoy/
+cp -a ventoy_mips64.cpio $VENTOY_PATH/INSTALL/ventoy/
 

diff --git a/INSTALL/README b/INSTALL/README
index db836ce63a8806bc9490d34fa6737d08310d229c..c90d18963bdd78ec8185ec849b79553d2f674879 100644 (file)
--- a/INSTALL/README
+++ b/INSTALL/README
@@ -21,6 +21,8 @@ Please refer https://www.ventoy.net/en/doc_start.html for details.
 1. sudo sh VentoyWeb.sh 
 2. open your browser and visit http://127.0.0.1:24680
 
+========== VentoyWebDeepin.sh ===============
+1. sudo sh VentoyWebDeepin.sh 
 
 
 ========== CreatePersistentImg.sh ===============

diff --git a/INSTALL/Ventoy2Disk.sh b/INSTALL/Ventoy2Disk.sh
index fb499a95ebbe329abb489e4e05eb95fd0cdf42e7..5b1d6f4cba4968bbae23538647d2bab41524c266 100644 (file)
--- a/INSTALL/Ventoy2Disk.sh
+++ b/INSTALL/Ventoy2Disk.sh
@@ -16,6 +16,8 @@ if uname -m | egrep -q 'aarch64|arm64'; then
     export TOOLDIR=aarch64
 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

diff --git a/INSTALL/VentoyWeb.sh b/INSTALL/VentoyWeb.sh
index 4c811e00ac464df0eb6a912cf3c1564f8b3ccca8..061120b809455101896eca73f063195ccd9f630f 100644 (file)
--- a/INSTALL/VentoyWeb.sh
+++ b/INSTALL/VentoyWeb.sh
@@ -27,6 +27,8 @@ if uname -m | egrep -q 'aarch64|arm64'; then
     TOOLDIR=aarch64
 elif uname -m | egrep -q 'x86_64|amd64'; then
     TOOLDIR=x86_64
+elif uname -m | egrep -q 'mips64'; then
+    TOOLDIR=mips64el
 else
     TOOLDIR=i386
 fi

diff --git a/INSTALL/VentoyWebDeepin.sh b/INSTALL/VentoyWebDeepin.sh
new file mode 100644 (file)
index 0000000..c17607e
--- /dev/null
+++ b/INSTALL/VentoyWebDeepin.sh
@@ -0,0 +1,192 @@
+#!/bin/sh
+
+print_usage() {    
+    echo 'Usage:  VentoyWebDeepin.sh [ OPTION ]'   
+    echo '  OPTION: (optional)'
+    echo '   -H x.x.x.x  http server IP address (default is 127.0.0.1)'
+    echo '   -p PORT     http server PORT (default is 24680)'
+    echo '   -h          print this help'
+    echo ''
+}
+
+print_err() {
+    echo ""
+    echo "$*"
+    echo ""
+}
+
+
+get_user() {
+    name=$(logname)
+    if [ -n "$name" -a "$name" != "root" ]; then
+        echo $name; return
+    fi
+    
+    name=${HOME#/home/}
+    if [ -n "$name" -a "$name" != "root" ]; then
+        echo $name; return
+    fi
+}
+
+
+uid=$(id -u)
+if [ $uid -ne 0 ]; then
+    exec sudo sh $0 $*
+fi
+
+OLDDIR=$(pwd)
+
+if uname -m | egrep -q 'aarch64|arm64'; then
+    TOOLDIR=aarch64
+elif uname -m | egrep -q 'x86_64|amd64'; then
+    TOOLDIR=x86_64
+elif uname -m | egrep -q 'mips64'; then
+    TOOLDIR=mips64el
+else
+    TOOLDIR=i386
+fi
+
+if [ ! -f ./tool/$TOOLDIR/V2DServer ]; then
+    if [ -f ${0%VentoyWebDeepin.sh}/tool/$TOOLDIR/V2DServer ]; then
+        cd ${0%VentoyWebDeepin.sh}
+    fi
+fi
+
+PATH=./tool/$TOOLDIR:$PATH
+
+if [ ! -f ./boot/boot.img ]; then
+    if [ -d ./grub ]; then
+        echo "Don't run VentoyWebDeepin.sh here, please download the released install package, and run the script in it."
+    else
+        echo "Please run under the correct directory!" 
+    fi
+    exit 1
+fi
+
+HOST="127.0.0.1"
+PORT=24680
+
+while [ -n "$1" ]; do
+    if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+        print_usage
+        exit 0
+    elif [ "$1" = "-H" ]; then
+        shift
+        if echo $1 | grep -q '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*'; then
+            HOST="$1"
+        else
+            print_err "Invalid host $1"
+            exit 1
+        fi        
+    elif [ "$1" = "-p" ]; then
+        shift
+        if [ $1 -gt 0 -a $1 -le 65535 ]; then
+            PORT="$1"
+        else
+            print_err "Invalid port $1"
+            exit 1
+        fi
+    fi
+    
+    shift
+done
+
+
+if ps -ef | grep "V2DServer.*$HOST.*$PORT" | grep -q -v grep; then
+    print_err "Another ventoy server is running now, please close it first."
+    exit 1
+fi
+
+VUSER=$(get_user)
+
+LOGFILE=log.txt
+if [ -e $LOGFILE ]; then
+    chown $VUSER $LOGFILE
+else
+    su $VUSER -c "touch $LOGFILE"
+fi
+
+#delete the log.txt if it's more than 8MB
+if [ -f $LOGFILE ]; then
+    logsize=$(stat -c '%s' $LOGFILE)
+    if [ $logsize -gt 8388608 ]; then
+        rm -f $LOGFILE
+    fi
+fi
+
+
+if [ -f ./tool/$TOOLDIR/V2DServer.xz ]; then
+    xz -d ./tool/$TOOLDIR/V2DServer.xz
+    chmod +x ./tool/$TOOLDIR/V2DServer
+fi
+
+rm -rf ./*_VTMPDIR
+vtWebTmpDir=$(mktemp -d -p ./ --suffix=_VTMPDIR)
+chown $VUSER $vtWebTmpDir
+
+
+V2DServer "$HOST" "$PORT" &
+V2DPid=$!
+sleep 1
+
+su $VUSER -c "browser --window-size=550,400 --app=\"http://${HOST}:${PORT}/index.html?chrome-app\"  --user-data-dir=$vtWebTmpDir >> $LOGFILE 2>&1" &
+WebPid=$!
+
+
+vtoy_trap_exit() {
+
+    [ -d /proc/$V2DPid ] && kill -2 $V2DPid
+    [ -d /proc/$WebPid ] && kill -9 $WebPid
+
+    while [ -n "1" ]; do
+        curPid=$(ps -ef | grep -m1 "$vtWebTmpDir" | egrep -v '\sgrep\s' | awk '{print $2}')
+        if [ -z "$curPid" ]; then
+            break
+        fi
+        
+        if [ -d /proc/$curPid ]; then
+            kill -9 $curPid
+        fi
+    done
+
+    [ -d $vtWebTmpDir ] && rm -rf $vtWebTmpDir
+
+    if [ -n "$OLDDIR" ]; then 
+        CURDIR=$(pwd)
+        if [ "$CURDIR" != "$OLDDIR" ]; then
+            cd "$OLDDIR"
+        fi
+    fi
+
+    exit 1
+}
+
+trap vtoy_trap_exit HUP INT QUIT TSTP
+sleep 1
+
+
+vtVer=$(cat ventoy/version)
+echo ""
+echo "=================================================="
+if [ "$LANG" = "zh_CN.UTF-8" ]; then
+    echo "  Ventoy Server $vtVer 已经启动 ..."
+else
+    echo "  Ventoy Server $vtVer is running ..."
+fi
+echo "=================================================="
+echo ""
+echo "########### Press Ctrl + C to exit ###############"
+echo ""
+
+wait $WebPid
+
+[ -d /proc/$V2DPid ] && kill -2 $V2DPid
+
+[ -d $vtWebTmpDir ] && rm -rf $vtWebTmpDir
+
+if [ -n "$OLDDIR" ]; then 
+    CURDIR=$(pwd)
+    if [ "$CURDIR" != "$OLDDIR" ]; then
+        cd "$OLDDIR"
+    fi
+fi

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 3513df39632d26f489eec4d7af88cabbebef8207..85a630a18b0b59b9a5965f6f880853838840430d 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -1584,7 +1584,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.36"
+set VENTOY_VERSION="1.0.37"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1

diff --git a/INSTALL/ventoy_pack.sh b/INSTALL/ventoy_pack.sh
index 8c2655c35103f0c0920b5a156fde1390d96e5a52..8a5ad7058dbebe52d7d59c86e57a9a6ecd664de6 100644 (file)
--- a/INSTALL/ventoy_pack.sh
+++ b/INSTALL/ventoy_pack.sh
@@ -94,11 +94,15 @@ cp $OPT ./tool $tmpdir/
 rm -f $tmpdir/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
 cp $OPT Ventoy2Disk.sh $tmpdir/
 cp $OPT VentoyWeb.sh $tmpdir/
+cp $OPT VentoyWebDeepin.sh $tmpdir/
+#cp $OPT Ventoy.desktop $tmpdir/
 cp $OPT README $tmpdir/
 cp $OPT plugin $tmpdir/
 cp $OPT CreatePersistentImg.sh $tmpdir/
 dos2unix -q $tmpdir/Ventoy2Disk.sh
 dos2unix -q $tmpdir/VentoyWeb.sh
+dos2unix -q $tmpdir/VentoyWebDeepin.sh
+#dos2unix -q $tmpdir/Ventoy.desktop
 dos2unix -q $tmpdir/CreatePersistentImg.sh
 
 cp $OPT ../LinuxGUI/WebUI $tmpdir/
@@ -130,6 +134,8 @@ find $tmpdir/ -type d -exec chmod 755 "{}" +
 find $tmpdir/ -type f -exec chmod 644 "{}" +
 chmod +x $tmpdir/Ventoy2Disk.sh
 chmod +x $tmpdir/VentoyWeb.sh
+chmod +x $tmpdir/VentoyWebDeepin.sh
+#chmod +x $tmpdir/Ventoy.desktop
 chmod +x $tmpdir/CreatePersistentImg.sh
 
 tar -czvf ventoy-${curver}-linux.tar.gz $tmpdir

diff --git a/LANGUAGES/languages.ini b/LANGUAGES/languages.ini
index 091bc27c6ab4be30a1bb52ca74e74aba1c7fb6c2..fdf6949bba01f7a648eb637704909c1196665172 100644 (file)
Binary files a/LANGUAGES/languages.ini and b/LANGUAGES/languages.ini differ

diff --git a/LinuxGUI/WebUI/index.html b/LinuxGUI/WebUI/index.html
index 8b16692726ab195bb60b1572e3f037416a01ebb6..2ebdff29505c1cbcb307cbf21768130fd8f99a2b 100644 (file)
--- a/LinuxGUI/WebUI/index.html
+++ b/LinuxGUI/WebUI/index.html
@@ -171,7 +171,7 @@
     </style>\r
 </head>\r
 \r
-<body style="overflow:hidden">\r
+<body style="overflow:hidden;">\r
     <div class="wrapper" >\r
         <!-- Content Wrapper. Contains page content -->\r
         <div id='vtoy_main_div' style='width:540px; position:absolute;'>\r
@@ -580,11 +580,16 @@
     }\r
         \r
     function ResizeWindow() {\r
-        //console.log(window.screen.width + ' [x1] ' + window.screen.height);        \r
+        //console.log(window.screen.availWidth + ' [x1] ' + window.screen.availHeight);        \r
         //console.log(vtoy_app_width + ' [x2] ' + vtoy_app_height);\r
-        //console.log((window.screen.width - vtoy_app_width) / 2 + ' [x3] ' + (window.screen.height - vtoy_app_height) / 2);        \r
-        window.moveTo((window.screen.width - vtoy_app_width) / 2, (window.screen.height - vtoy_app_height) / 2);\r
-        window.resizeTo(vtoy_app_width, vtoy_app_height);\r
+        //console.log((window.screen.availWidth - vtoy_app_width) / 2 + ' [x3] ' + (window.screen.availHeight - vtoy_app_height) / 2);        \r
+        \r
+        window.onresize = function() { };\r
+        \r
+        window.resizeTo(vtoy_app_width, vtoy_app_height);        \r
+        window.moveTo((window.screen.availWidth - vtoy_app_width) / 2, (window.screen.availHeight - vtoy_app_height) / 2);\r
+        \r
+        window.onresize = ResizeWindow;\r
     }\r
 \r
     function MoveMainDivToCenter() {\r
@@ -1012,9 +1017,6 @@
     $('#vtoy_part_align_4kb').prop("checked", true);\r
     \r
     if (vtoy_chrome_app_mode) {\r
-        window.onresize = function() {\r
-            ResizeWindow();\r
-        }\r
         ResizeWindow();\r
     } else {\r
         $('#vtoy_main_div').css("border", '2px solid #f4f4f4');\r

diff --git a/LinuxGUI/WebUI/static/img/VentoyLogo.png b/LinuxGUI/WebUI/static/img/VentoyLogo.png
new file mode 100644 (file)
index 0000000..a13884a
Binary files /dev/null and b/LinuxGUI/WebUI/static/img/VentoyLogo.png differ

diff --git a/vtoyfat/fat_io_lib/buildlib.sh b/vtoyfat/fat_io_lib/buildlib.sh
index 50b5fc913167e84dc189b57a39a89edc1cf38067..eaab1197ae539b9ef41c56a8208b91b0c0695fd8 100644 (file)
--- a/vtoyfat/fat_io_lib/buildlib.sh
+++ b/vtoyfat/fat_io_lib/buildlib.sh
@@ -27,6 +27,10 @@ ar -rc libfat_io_aa64.a *.o
 rm -f *.o
 
 
+mips64el-linux-musl-gcc -mips64r2 -mabi=64 -O2 -D_FILE_OFFSET_BITS=64 fat*.c -c
+ar -rc libfat_io_m64e.a *.o
+rm -f *.o
+
 cd -