Browse Source

Fix variable ordering

bryan 2 weeks ago
parent
commit
f54273a745
1 changed files with 3 additions and 6 deletions
  1. 3 6
      installJRMC

+ 3 - 6
installJRMC

@@ -260,7 +260,8 @@ parse_input() {
     declare -ga SERVICES CONTAINERS
     local long_opts short_opts input
 
-    # Defaults
+    declare -g SCRIPT_PATH; SCRIPT_PATH=$(readlink -f "${BASH_SOURCE[0]}")
+    declare -g SCRIPT_DIR=; SCRIPT_DIR=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")
     declare -g \
         BUILD_TARGET="$ID" \
         REPO_TARGET="$ID" \
@@ -268,13 +269,9 @@ parse_input() {
         OUTPUT_DIR="$SCRIPT_DIR/output" \
         CREATEREPO_WEBROOT="/var/www/jriver" \
         USER="${SUDO_USER:-$USER}"
-
-    declare -g SCRIPT_PATH; SCRIPT_PATH=$(readlink -f "${BASH_SOURCE[0]}")
-    declare -g SCRIPT_DIR=; SCRIPT_DIR=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")
+    
     declare -g HOME; HOME=$(getent passwd "$USER" | cut -d: -f6)
 
-    declare -p
-
     # Set some defaults if zero or one arguments are passed
     if [[ $# -eq 0 && $ID != "unknown" ]]; then
         debug "Automatically setting --install repo"