fixes, logging, and better shellcheck conformance

[distro-setup] / primary-setup

diff --git a/primary-setup b/primary-setup
index 8683dcf433d0e4359c631487873051bd80ee65e0..e7d70f2eaaf72c257e05be299feaa7bf3a76802d 100755 (executable)
--- a/primary-setup
+++ b/primary-setup
@@ -7,13 +7,14 @@ source /usr/local/lib/err
 
 script_name="${BASH_SOURCE[0]}"
 script_name="${script_name##*/}"
-pre="${SSH_CLIENT:+$HOSTNAME} $script_name:"
+pre="$script_name:${0##*/}:${SSH_CLIENT:+ $HOSTNAME:}"
 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}
+  local service
+  service="${*: -1}"
   if [[ ! -s /etc/systemd/system/$service ]]; then
     return 0
   fi