bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Fix variable ordering

Browse Source
This commit is contained in:
Bryan Roessler
2024-10-03 23:47:06 -04:00
parent 952560310a
commit f54273a745
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
installJRMC
View File

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