shellcheck and fix checkrestart false positive

[distro-setup] / keyscript-off

diff --git a/keyscript-off b/keyscript-off
index bb63cb211a206b1b2029dbfaf7976496faaee0f8..84f253c27e800674675af3d9ea4d429c92a5366a 100755 (executable)
--- a/keyscript-off
+++ b/keyscript-off
@@ -16,17 +16,13 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
-[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
+[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 if [[ $- != *i* ]]; then
     exec &>/var/log/keyscript-off.log
     echo "$0: starting. $(date)"
 fi
 sed="sed --follow-symlinks"
 
-if [[ $HOSTNAME == kw ]]; then
-    exit 0
-fi
-
 if [[ $($sed -rn 's/^ID=(.*)/\1/p' /etc/os-release) == arch ]]; then
     if grep -q '^\s*FILES=' /etc/mkinitcpio.conf; then
         $sed -ri 's/^\s*FILES=/#\0/' /etc/mkinitcpio.conf # comment out