X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/67e839b9f2a7bc66cff31621047b0e0c5b652d87..fc5cd0a00a6745d7a8ce31bfadd76e8d064e18a1:/INSTALL/tool/WebUos.sh

diff --git a/INSTALL/tool/WebUos.sh b/INSTALL/tool/WebUos.sh
index 8646591..793e85b 100644
--- a/INSTALL/tool/WebUos.sh
+++ b/INSTALL/tool/WebUos.sh
@@ -16,14 +16,29 @@ if [ -f ./tool/$TOOLDIR/V2DServer.xz ]; then
     chmod +x ./tool/$TOOLDIR/V2DServer
 fi
 
-rm -rf ./*_VTMPDIR
-vtWebTmpDir=$(mktemp -d -p ./ --suffix=_VTMPDIR)
-
 V2DServer "$HOST" "$PORT" &
 V2DPid=$!
 sleep 1
 
 
+vtoy_trap_exit() {
+
+    [ -d /proc/$V2DPid ] && kill -2 $V2DPid
+
+    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 "=================================================="
@@ -37,11 +52,13 @@ echo ""
 echo "########### Press Ctrl + C to exit ###############"
 echo ""
 
-
-uos-browser --window-size=550,400 --app="http://${HOST}:${PORT}/index.html?chrome-app"  --user-data-dir=$vtWebTmpDir >> $LOGFILE 2>&1
+if [ "$VERBOSE" = "1" ]; then
+    uos-browser --window-size=550,400 --app="http://${HOST}:${PORT}/index.html?chrome-app"
+else
+    uos-browser --window-size=550,400 --app="http://${HOST}:${PORT}/index.html?chrome-app" > /dev/null 2>&1
+fi
 
 [ -d /proc/$V2DPid ] && kill -2 $V2DPid
-[ -d $vtWebTmpDir ] && rm -rf $vtWebTmpDir
 
 if [ -n "$OLDDIR" ]; then 
     CURDIR=$(pwd)