From 4fd858d63547b173ddca97ff3a91a945e1469177 Mon Sep 17 00:00:00 2001 From: bryan Date: Fri, 13 Jan 2023 11:48:47 -0500 Subject: [PATCH] Ensure srcdir and bindir --- openwrtbuilder | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openwrtbuilder b/openwrtbuilder index c4aa035..cee7c96 100755 --- a/openwrtbuilder +++ b/openwrtbuilder @@ -616,7 +616,13 @@ main() { # Fallback to SCRIPTDIR if BUILDROOT has not been set declare -g BUILDROOT="${BUILDROOT:=$SCRIPTDIR}" [[ $BUILDROOT == "/" ]] && echo "Invalid --buildroot" && exit 1 - declare -g FILESDIR="${FILESDIR:=$BUILDROOT/files}" + declare -g FILESDIR="${FILESDIR:=$BUILDROOT/src/files}" + declare -g SRCDIR="$BUILDROOT/src" # input/build + declare -g BINDIR="$BUILDROOT/bin" # output + + for dir in "$SRCDIR" "$BINDIR"; do + [[ -d "$dir" ]] || mkdir -p "$dir" + done # Allow --reset without a profile if [[ ${#PROFILES} -lt 1 ]]; then @@ -643,8 +649,6 @@ main() { # release precedence: user input>profile>env>hardcode declare -g RELEASE="${USER_RELEASE:=${P_ARR[release]:=$RELEASE}}" - declare -g SRCDIR="$BUILDROOT/src" - declare -g BINDIR="$BUILDROOT/bin" declare -g BUILDDIR="$SRCDIR/${P_ARR[profile]}-$RELEASE" declare -g IB_ARCHIVE="$SRCDIR/${P_ARR[profile]}-$RELEASE.tar.xz" declare -g FILESYSTEM="${P_ARR[filesystem]:="squashfs"}"