X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=primary-setup;fp=primary-setup;h=8683dcf433d0e4359c631487873051bd80ee65e0;hb=7fe1df9789fd03b11c9572898b6286221e7db12f;hp=b8e594cbd93218e522253dbcbef5c8360d2f663f;hpb=5caf70ebd54aed4f4c661d519dc5cf8e757e2708;p=distro-setup diff --git a/primary-setup b/primary-setup index b8e594c..8683dcf 100755 --- a/primary-setup +++ b/primary-setup @@ -11,7 +11,14 @@ pre="${SSH_CLIENT:+$HOSTNAME} $script_name:" m() { printf "$pre %s\n" "$*"; "$@"; } e() { printf "$pre %s\n" "$*"; } err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $0: $*" >&2; } - +# service maybe +serm() { + local service=${@: -1} + if [[ ! -s /etc/systemd/system/$service ]]; then + return 0 + fi + m "$@" +} [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" @@ -45,7 +52,7 @@ fi if [[ $HOSTNAME == "$MAIL_HOST" || $HOSTNAME == kd ]]; then m systemctl --now enable btrbk.timer else - m systemctl --now disable btrbk.timer + serm systemctl --now disable btrbk.timer fi @@ -60,8 +67,8 @@ if dpkg -s rss2email &>/dev/null; then rm -f ${files[@]} fi - m systemctl stop rss2email.service - m systemctl --now disable rss2email.timer + serm systemctl stop rss2email.service + serm systemctl --now disable rss2email.timer # arbtt disabled for now # for ((i=0; i<10; i++)); do # killall arbtt-capture || break