smarter way to use restart command in other scripts

Serghey Rodin · Serghey Rodin · commit 51be240bd487 · 2016-11-09T17:45:43.000+02:00
diff --git a/bin/v-list-user-log b/bin/v-list-user-log
@@ -24,7 +24,6 @@ json_list() {
     echo "{"
     for str in $logs; do
         eval $str
-        CMD=${CMD//\"/\\\"}
         echo -n '    "'$ID'": {
         "CMD": "'$CMD'",
         "UNDO": "'$UNDO'",
diff --git a/bin/v-restart-cron b/bin/v-restart-cron
@@ -30,6 +30,11 @@ send_email_report() {
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Exit
+if [ "$1" = "no" ]; then
+    exit
+fi
+
 # Schedule restart
 if [ "$1" = 'scheduled' ]; then
     echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
diff --git a/bin/v-restart-dns b/bin/v-restart-dns
@@ -35,6 +35,11 @@ send_email_report() {
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Exit
+if [ "$1" = "no" ]; then
+    exit
+fi
+
 # Schedule restart
 if [ "$1" = 'scheduled' ]; then
     echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
diff --git a/bin/v-restart-ftp b/bin/v-restart-ftp
@@ -30,6 +30,11 @@ send_email_report() {
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Exit
+if [ "$1" = "no" ]; then
+    exit
+fi
+
 # Schedule restart
 if [ "$1" = 'scheduled' ]; then
     echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
diff --git a/bin/v-restart-mail b/bin/v-restart-mail
@@ -30,6 +30,11 @@ send_email_report() {
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Exit
+if [ "$1" = "no" ]; then
+    exit
+fi
+
 # Schedule restart
 if [ "$1" = 'scheduled' ]; then
     echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
diff --git a/bin/v-restart-proxy b/bin/v-restart-proxy
@@ -30,6 +30,11 @@ send_email_report() {
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Exit
+if [ "$1" = "no" ]; then
+    exit
+fi
+
 # Schedule restart
 if [ "$1" = 'scheduled' ]; then
     echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
diff --git a/bin/v-restart-web b/bin/v-restart-web
@@ -30,6 +30,11 @@ send_email_report() {
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Exit
+if [ "$1" = "no" ]; then
+    exit
+fi
+
 # Schedule restart
 if [ "$1" = 'scheduled' ]; then
     echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
diff --git a/bin/v-restart-web-backend b/bin/v-restart-web-backend
@@ -30,6 +30,11 @@ send_email_report() {
 #                       Action                             #
 #----------------------------------------------------------#
 
+# Exit
+if [ "$1" = "no" ]; then
+    exit
+fi
+
 # Schedule restart
 if [ "$1" = 'scheduled' ]; then
     echo "$BIN/$SCRIPT now" >> $VESTA/data/queue/restart.pipe
