# improve

czy21 · Aug 12, 2024 · cd72de2 · cd72de2
1 parent 2ca9c7c
commit cd72de2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/server/router/watchcat/conf/esxi.sh b/server/router/watchcat/conf/esxi.sh
@@ -6,9 +6,9 @@ esxi_host_cmd="ssh esxi"
 
 function close_vms(){
     for t in $1;do
-        if [ `$esxi_host_cmd vim-cmd vmsvc/power.getstate $t | grep 'Powered on' -q && echo true` ];then
+        if `$esxi_host_cmd vim-cmd vmsvc/power.getstate $t | grep 'Powered on' -q`;then
             vm_name=`$esxi_host_cmd vim-cmd vmsvc/get.summary $t | grep name`
-            if [ `$esxi_host_cmd vim-cmd vmsvc/get.summary $t | grep toolsOk -q && echo true` ];then
+            if `$esxi_host_cmd vim-cmd vmsvc/get.summary $t | grep 'toolsOk' -q`;then
               logger -t "${LOG_TAG}" "id: $t $vm_name power.shutdown"
               $esxi_host_cmd vim-cmd vmsvc/power.shutdown $t
             else
@@ -24,7 +24,7 @@ function check_vms(){
     while [ $vms_off == false ]
     do
       for t in $1;do
-        vms_off=`$esxi_host_cmd vim-cmd vmsvc/power.getstate $t | grep 'Powered off' -q && echo true || false`
+        vms_off=`$esxi_host_cmd vim-cmd vmsvc/power.getstate $t | grep 'Powered off' -q && echo true || echo false`
       done
     done
 }

diff --git a/server/router/watchcat/init.sh b/server/router/watchcat/init.sh
@@ -4,6 +4,7 @@ param_command="{{ param_command }}"
 etc_app_path="{{ param_app_path }}"
 if [ "install" = "${param_command}" ];then
   mkdir -p ${etc_app_path} && cp -r {{ param_role_output_path }}/conf/* ${etc_app_path}
+  chmod +x ${etc_app_path}/*.sh
 fi
 
 if [ "backup" = "${param_command}" ];then
@@ -12,4 +13,5 @@ fi
 
 if [ "restore" = "${param_command}" ];then
   mkdir -p ${etc_app_path} && cp -r {{ param_role_bak_path }}/* ${etc_app_path}
+  chmod +x ${etc_app_path}/*.sh
 fi