From db892d5e12fd7eeef70736d3f03f35a2a4d09297 Mon Sep 17 00:00:00 2001
From: longpanda <admin@ventoy.net>
Date: Wed, 10 Mar 2021 14:18:24 +0800
Subject: [PATCH] optimization for script for UOS

---
 INSTALL/VentoyWebDeepin.sh |  7 +++++++
 INSTALL/tool/WebUos.sh     | 29 +++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/INSTALL/VentoyWebDeepin.sh b/INSTALL/VentoyWebDeepin.sh
index eeb982f7..1bcaf2b9 100644
--- a/INSTALL/VentoyWebDeepin.sh
+++ b/INSTALL/VentoyWebDeepin.sh
@@ -1,11 +1,16 @@
 #!/bin/sh
 
+if echo "$*" | grep -q '[-]v'; then
+    set -x
+fi
+
 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 '   -v          print verbose info'
     echo ''
 }
 
@@ -68,6 +73,8 @@ while [ -n "$1" ]; do
     if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
         print_usage
         exit 0
+    elif [ "$1" = "-v" ]; then
+        VERBOSE=1
     elif [ "$1" = "-H" ]; then
         shift
         if echo $1 | grep -q '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*'; then
diff --git a/INSTALL/tool/WebUos.sh b/INSTALL/tool/WebUos.sh
index 86465911..793e85b0 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)