various fixes, improvements, shellcheck

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index 1e99b03a004447eb1124f1d1585b5aa33a919a5a..32a422d7ea223a943727927661117641e52fd5ab 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -18,11 +18,11 @@
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
-readonly this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"
-script_dir="${this_file%/*}"
-# shellcheck source=./bash-trace
-source "${script_dir}/bash-trace"
-cd $script_dir
+set -e; . /usr/local/lib/bash-bear; set +e
+
+this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"
+readonly this_file this_dir="${this_file%/*}"
+cd "$this_dir"
 PATH="$PATH:$PWD"
 
 
@@ -221,12 +221,14 @@ set-pxe() {
   if $fsf_office; then
     if [[ ! $cmd ]]; then
       e "removing pxe for $host on tarantula"
+      # shellcheck disable=SC2087 # shellcheck being dumb
       ssh tarantula.office.fsf.org bash -e <<EOF
 sed -ri 's/^( *host +$host *\{).*/\1/' /etc/dhcp/dhcpd.conf
 systemctl restart isc-dhcp-server
 EOF
     elif [[ $cmd == fai ]]; then
       e "adding pxe for $host on tarantula"
+      # shellcheck disable=SC2087 # shellcheck being dumb
       ssh tarantula.office.fsf.org bash -e <<EOF
 sed -ri 's/^( *host +$host *\{).*/\1 next-server faiserver.office.fsf.org; filename "pxelinux.0";/' /etc/dhcp/dhcpd.conf
 systemctl restart isc-dhcp-server