shellcheck, better automated upgrades

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index ec39e9d1160a610c10fa07ffd9ece72b38e62410..0601ff4cef1adba21cb558a04c2f7e72b88f0914 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -65,7 +65,8 @@ fi
 
 
 ##### variables/env setup
-script_dir="$(readlink -f "$BASH_SOURCE")"; script_dir=${script_dir%/*}
+script_dir="$(readlink -f "${BASH_SOURCE[@]}")"; script_dir=${script_dir%/*}
+# shellcheck source=./pkgs
 source $script_dir/pkgs
 set +x
 source /a/bin/distro-functions/src/identify-distros
@@ -138,7 +139,7 @@ EOF
   sudo systemctl start keyscriptoff.service
 
   # from /usr/share/doc/dropbear-initramfs/README.initramfs.gz
-  while read m _; do /sbin/modinfo -F filename "$m"; done </proc/modules | \
+  while read -r m _; do /sbin/modinfo -F filename "$m"; done </proc/modules | \
     sed -nr "s@^/lib/modules/`uname -r`/kernel/drivers/net(/.*)?/([^/]+)\.ko\$@\2@p" \
     | sudo dd of=/etc/initramfs-tools/modules
   sudo apt-get -y install initramfs-tools-core
@@ -448,7 +449,7 @@ if has_btrfs || home_network; then
   pi nfs-common
   s dd of=/root/imount <<'EOF'
 #!/bin/bash
-[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
+[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 for dir in /i /mnt/iroot /k /kr /w; do