Skip to content

Commit a563315

Browse files
committed
fix some errors
1 parent 38424f9 commit a563315

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

manage-bot/list.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
dir="$(cd $(dirname $0)/..; pwd)"
44
bot_list="$(
5-
$dir/node_modules/.bin/forever list \
5+
forever list \
66
| sed '1,2d' \
77
| awk '{print $3, $5, $9}'
88
)"
@@ -11,8 +11,8 @@ printf '['
1111
for bot in $dir/*-bot/index.js
1212
do
1313
bot_name=$(echo $bot | xargs dirname | xargs basename)
14-
pid=$(echo "$bot_list" | grep $bot_name | awk '{print $1}')
15-
uptime=$(echo "$bot_list" | grep $bot_name | awk '{print $3}')
14+
pid=$(echo "$bot_list" | grep "/$bot_name/" | awk '{print $1}')
15+
uptime=$(echo "$bot_list" | grep "/$bot_name/" | awk '{print $3}')
1616
emoji=$(awk '/Help:$/{getline;print}' $bot | sed 's/^[^:]*://;s/:[^:]*$//')
1717
uptime="$(echo $uptime | perl -pe 's/(\d+):(\d+):(\d+):(\d+)\.(\d+)/$1 days $2:$3:$4/')"
1818
printf '{'

manage-bot/log.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if [[ ! -f $dir/$bot/index.js ]]; then
1414
fi
1515

1616
bot_list="$(
17-
$dir/node_modules/.bin/forever list \
17+
forever list \
1818
| sed '1,2d' \
1919
| awk '{print $5, $8}' \
2020
| sort -k2
@@ -23,5 +23,5 @@ $dir/node_modules/.bin/forever list \
2323
if [[ $2 =~ [0-9]+ ]]; then
2424
line=$2
2525
fi
26-
log_file=$(echo "$bot_list" | grep "$bot" | awk '{print $2}')
26+
log_file=$(echo "$bot_list" | grep "/$bot/" | awk '{print $2}')
2727
tail -n ${line:-30} "$log_file"

manage-bot/start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dir="$(cd $(dirname $0)/..; pwd)"
44

55
ret=0
66
bot="$1"
7-
forever=$dir/node_modules/.bin/forever
7+
forever=forever
88

99
if [[ -z $bot ]] || [[ $bot == undefined ]]; then
1010
echo "specify bot name" >&2

manage-bot/stop.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dir="$(cd $(dirname $0)/..; pwd)"
44

55
ret=0
66
bot="$1"
7-
forever=$dir/node_modules/.bin/forever
7+
forever=forever
88

99
if [[ -z $bot ]] || [[ $bot == undefined ]]; then
1010
echo "specify bot name" >&2

uptime-bot/uptime.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
dir="$(cd $(dirname $0)/..; pwd)"
44

5-
bot_list="$($dir/node_modules/.bin/forever list | sed '1,2d' | awk '{print $5, $9}')"
5+
bot_list="$(forever list | sed '1,2d' | awk '{print $5, $9}')"
66

77
printf '['
88
for bot in $dir/*-bot
99
do
1010
name="${bot##*/}"
11-
uptime="$(echo "$bot_list" | awk '$1 ~ /'"$name"'/{print $2}')"
11+
uptime="$(echo "$bot_list" | grep "/$name/" | awk '{print $2}')"
1212

1313
printf '{'
1414
printf '"title":"%s",' "$name"

0 commit comments

Comments
 (0)