optimization for script for UOS

diff --git a/INSTALL/VentoyWebDeepin.sh b/INSTALL/VentoyWebDeepin.sh
index eeb982f72e4a16829ade3ceaf9c0ac825514b9a3..1bcaf2b95421312f9bdf7bc729c483e128301739 100644 (file)
--- a/INSTALL/VentoyWebDeepin.sh
+++ b/INSTALL/VentoyWebDeepin.sh
@@ -1,11 +1,16 @@
 #!/bin/sh
 
 #!/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'
 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 ''
 }
 
     echo ''
 }
 


@@ -68,6 +73,8 @@ while [ -n "$1" ]; do
     if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
         print_usage
         exit 0
     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
     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 864659118938b30cd3a3ae47485c339f65d20651..793e85b090b619dd4bfea130b809b6b916537112 100644 (file)
--- 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
 
     chmod +x ./tool/$TOOLDIR/V2DServer
 fi
 

-rm -rf ./*_VTMPDIR
-vtWebTmpDir=$(mktemp -d -p ./ --suffix=_VTMPDIR)
-

 V2DServer "$HOST" "$PORT" &
 V2DPid=$!
 sleep 1
 
 
 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 "=================================================="
 vtVer=$(cat ventoy/version)
 echo ""
 echo "=================================================="


@@ -37,11 +52,13 @@ echo ""
 echo "########### Press Ctrl + C to exit ###############"
 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 /proc/$V2DPid ] && kill -2 $V2DPid

-[ -d $vtWebTmpDir ] && rm -rf $vtWebTmpDir

 
 if [ -n "$OLDDIR" ]; then 
     CURDIR=$(pwd)
 
 if [ -n "$OLDDIR" ]; then 
     CURDIR=$(pwd)