shellcheck and fix checkrestart false positive

[distro-setup] / keyscript-on

diff --git a/keyscript-on b/keyscript-on
index 54a655cbec0eddc8ef83313b0d4d484ce24b72b4..e62c7ed63c14d4b6f1a9b50965a0511773d4aebf 100755 (executable)
--- a/keyscript-on
+++ b/keyscript-on
@@ -16,7 +16,7 @@
 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-on.log
     echo "$0: starting. $(date)"
@@ -41,6 +41,6 @@ if [[ ! -e /tmp/keyscript-off ]]; then
 fi
 # switch to easy or hard login pass which is the same as luks
 f=/q/root/shadow/traci-simple
-[[ $HOSTNAME != tp ]] || usermod -p "$(cat $f)" ian
+[[ $HOSTNAME != tpnew ]] || usermod -p "$(cat $f)" iank
 
 echo "$0: finished. $(date)"