Skip to content

Commit f371f6c

Browse files
LupulLupul
committed
More strict check when removing script from restart queue
1 parent 68ce7d8 commit f371f6c

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

‎bin/v-restart-cron‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -55,7 +55,7 @@ fi
5555

5656
# Update restart queue
5757
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
58-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
58+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
5959
fi
6060

6161

‎bin/v-restart-dns‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fi
4242

4343
# Schedule restart
4444
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
45-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
45+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4646
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4747
exit
4848
fi
@@ -60,7 +60,7 @@ fi
6060

6161
# Update restart queue
6262
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
63-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
63+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
6464
fi
6565

6666

‎bin/v-restart-ftp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -55,7 +55,7 @@ fi
5555

5656
# Update restart queue
5757
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
58-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
58+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
5959
fi
6060

6161

‎bin/v-restart-mail‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -64,7 +64,7 @@ fi
6464

6565
# Update restart queue
6666
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
67-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
67+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
6868
fi
6969

7070

‎bin/v-restart-proxy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -70,7 +70,7 @@ if [ -f "$HESTIA/web/inc/nginx_proxy" ]; then
7070

7171
# Update restart queue
7272
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
73-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
73+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
7474
fi
7575
fi
7676

‎bin/v-restart-web‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -55,7 +55,7 @@ if [ $? -ne 0 ]; then
5555

5656
# Update restart queue
5757
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
58-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
58+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
5959
fi
6060

6161
#----------------------------------------------------------#

‎bin/v-restart-web-backend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fi
3737

3838
# Schedule restart
3939
if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
40-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
40+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
4141
echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
4242
exit
4343
fi
@@ -63,7 +63,7 @@ fi
6363

6464
# Update restart queue
6565
if [ -e "$HESTIA/data/queue/restart.pipe" ]; then
66-
sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
66+
sed -i "/\/$SCRIPT now/d" $HESTIA/data/queue/restart.pipe
6767
fi
6868

6969

0 commit comments

Comments
 (0)