Fix installer

.gitignore

@@ -1,2 +1,3 @@
 old/
 manual.odt
+mwe

script-drives-add

@@ -3,7 +3,10 @@
 # TODO generalize
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-drives-fix-btrfs-full

@@ -2,7 +2,10 @@
 # Fix the btrfs out of space error
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-files-permissions-reset

@@ -2,7 +2,10 @@
 # Smartly change permissions on selected directories
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-files-permissions-set

@@ -2,7 +2,10 @@
 # Smartly change permissions on selected directories
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-install-manual-scripts

@@ -2,7 +2,10 @@
 # This script will add scripts-* to the PATH and the manual to each user's Desktop
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-install-motd

@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 # Install motd scripts
+# Bryan C. Roessler
 
-# shellcheck source=./functions
+parent="${BASH_SOURCE[0]}"
-[[ -f functions ]] && . functions || exit 1
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-install-reverse-proxy

@@ -2,7 +2,10 @@
 # Adds a reverse proxy for local system services
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-system-scheduled-restart

@@ -2,7 +2,10 @@
 # Update and restart the system
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-system-update

@@ -2,7 +2,10 @@
 # Update the system
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-user-add

@@ -2,7 +2,10 @@
 # Add a user to the Hartman Lab server
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-user-remove

@@ -2,7 +2,10 @@
 # Remove a user from the server
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-user-reset-password

@@ -2,7 +2,10 @@
 # This script will reset a user password on the server
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-user-reset-x2go

@@ -2,7 +2,10 @@
 # This script will reset x2go sessions to a working state
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root
 

script-user-unban

@@ -2,7 +2,10 @@
 # Unbans a fail2ban IP
 # Copyright 2021 Bryan C. Roessler
 
-[[ -f functions ]] && . functions || exit 1
+parent="${BASH_SOURCE[0]}"
+parent=${parent%/*}
+
+[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
 
 is_root