diff --git a/utils/fn_server/broadcast.sh b/utils/fn_server/broadcast.sh deleted file mode 100644 index 574bf4f..0000000 --- a/utils/fn_server/broadcast.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -function broadcast() { - local dir="$(getValueByKey 'PODMAN_DIRECTORY')/${1}" - podman exec -it "$1" rcon -m -H 127.0.0.1 -p 25575 -P $(grep -E "^rcon.password" $dir/data/server.properties | cut -d= -f2)\ - tellraw @a [{\"text\":\"[SYSTEM] \",\"color\":\"red\",\"bold\":true},{\"text\": \"$2\",\"color\":\"light_purple\",\"bold\":false}] -} - -function countdown() { - local dir="$(getValueByKey 'PODMAN_DIRECTORY')/${1}" - - for i in {10..1}; do - podman exec -it "$1" rcon -m -H 127.0.0.1 -p 25575 -P $(grep -E "^rcon.password" $dir/data/server.properties | cut -d= -f2)\ - tellraw @a [{\"text\": \"$i\",\"color\":\"light_purple\",\"bold\":false}] - done -} diff --git a/utils/fn_server/functions.sh b/utils/fn_server/functions.sh new file mode 100644 index 0000000..3647c12 --- /dev/null +++ b/utils/fn_server/functions.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +function help() { + echo -e "usage: $(basename ${0}) --server $1 +operations: + $(basename ${0}) --server $1 broadcast \"[message]\"" +} + +function restart_announcement() { + for count in {10..1}; do + broadcast "$1" "Server restarting in $count" + done +} + +function broadcast() { + local dir="$(getValueByKey 'PODMAN_DIRECTORY')/${1}" + podman exec -it "$1" rcon -m -H 127.0.0.1 -p 25575 -P $(grep -E "^rcon.password" $dir/data/server.properties | cut -d= -f2) tellraw @a [{\"text\":\"[SYSTEM] \",\"color\":\"red\",\"bold\":true},{\"text\": \"$2\",\"color\":\"light_purple\",\"bold\":false}] +} diff --git a/utils/fn_server/help.sh b/utils/fn_server/help.sh deleted file mode 100644 index cb51b3b..0000000 --- a/utils/fn_server/help.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -function help() { - echo -e "usage: $(basename ${0}) --server $1 -operations: - $(basename ${0}) --server $1 broadcast \"[message]\"" -} diff --git a/utils/server.sh b/utils/server.sh index 782112c..767e746 100644 --- a/utils/server.sh +++ b/utils/server.sh @@ -16,9 +16,9 @@ function server() { shift broadcast "$server" "$2" ;; - "countdown") + "restart") shift - countdown "$server" + restart_announcement "$server" ;; *) help "$server"