Skip to content

Commit 2b0b9d6

Browse files
authored
v-list-cron-job doesn't show MONTH. v-list-cron-jobs doesn't show DAY (hestiacp#4211)
1 parent ee5efa7 commit 2b0b9d6

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

bin/v-list-cron-job

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ shell_list() {
4747
echo "MINUTE: $MIN"
4848
echo "HOUR: $HOUR"
4949
echo "DAY: $DAY"
50+
echo "MONTH: $MONTH"
5051
echo "DAY OF WEEK: $WDAY"
5152
echo "COMMAND: $CMD"
5253
echo "SUSPENDED: $SUSPENDED"
@@ -56,13 +57,13 @@ shell_list() {
5657

5758
# PLAIN list function
5859
plain_list() {
59-
echo -e "$MIN\t$HOUR\t$DAY\t$WDAY\t$CMD\t$SUSPENDED\t$TIME\t$DATE"
60+
echo -e "$MIN\t$HOUR\t$DAY\t$MONTH\t$WDAY\t$CMD\t$SUSPENDED\t$TIME\t$DATE"
6061
}
6162

6263
# CSV list function
6364
csv_list() {
64-
echo "MIN,HOUR,DAY,WDAY,CMD,SUSPENDED,TIME,DATE"
65-
echo "$MIN,$HOUR,$DAY,$WDAY,\"$CMD\",$SUSPENDED,$TIME,$DATE'"
65+
echo "MIN,HOUR,DAY,MONTH,WDAY,CMD,SUSPENDED,TIME,DATE"
66+
echo "$MIN,$HOUR,$DAY,$MONTH,$WDAY,\"$CMD\",$SUSPENDED,$TIME,$DATE'"
6667
}
6768

6869
#----------------------------------------------------------#

bin/v-list-cron-jobs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ json_list() {
5656
# SHELL list function
5757
shell_list() {
5858
IFS=$'\n'
59-
echo "JOB^MIN^HOUR^MONTH^WDAY^COMMAND"
60-
echo "---^---^----^-----^----^-------"
59+
echo "JOB^MIN^HOUR^DAY^MONTH^WDAY^COMMAND"
60+
echo "---^---^----^---^-----^----^-------"
6161
while read str; do
6262
parse_object_kv_list "$str"
6363
CMD=$(echo "$CMD" | sed -e 's/"/\\"/g' -e "s/%quote%/'/g")
64-
echo "$JOB^$MIN^$HOUR^$MONTH^$WDAY^$CMD"
64+
echo "$JOB^$MIN^$HOUR^$DAY^$MONTH^$WDAY^$CMD"
6565
done < <(cat $USER_DATA/cron.conf)
6666
}
6767

@@ -71,7 +71,7 @@ plain_list() {
7171
while read str; do
7272
parse_object_kv_list "$str"
7373
CMD=$(echo "$CMD" | sed -e 's/"/\\"/g' -e "s/%quote%/'/g")
74-
echo -ne "$JOB\t$MIN\t$HOUR\t$MONTH\t$WDAY\t$CMD\t"
74+
echo -ne "$JOB\t$MIN\t$HOUR\t$DAY\t$MONTH\t$WDAY\t$CMD\t"
7575
echo -e "$SUSPENDED\t$TIME\t$DATE"
7676
done < <(cat $USER_DATA/cron.conf)
7777
}
@@ -83,7 +83,7 @@ csv_list() {
8383
while read str; do
8484
parse_object_kv_list "$str"
8585
CMD=$(echo "$CMD" | sed -e 's/"/\\"/g' -e "s/%quote%/'/g")
86-
echo -n "$JOB,$MIN,$HOUR,$MONTH,$WDAY,\"$CMD\","
86+
echo -n "$JOB,$MIN,$HOUR,$DAY,$MONTH,$WDAY,\"$CMD\","
8787
echo "$SUSPENDED,$TIME,$DATE"
8888
done < <(cat $USER_DATA/cron.conf)
8989
}

0 commit comments

Comments
 (0)