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

More multi-profile work

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-12 16:40:39 -05:00
parent 3683296110
commit 860631cf7d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openwrtbuilder
View File

@@ -526,6 +526,9 @@ init() {
debug || echo "To enable debugging output, use --debug or -d" debug || echo "To enable debugging output, use --debug or -d"
# Save the script directory
SCRIPTDIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 || exit $? ; pwd -P)"
if [[ -e "/etc/os-release" ]]; then if [[ -e "/etc/os-release" ]]; then
source "/etc/os-release" source "/etc/os-release"
else else
@@ -629,7 +632,6 @@ main() {
declare -gn P_ARR="$profile" declare -gn P_ARR="$profile"
# Fallback to SCRIPTDIR if BUILDROOT has not been set # Fallback to SCRIPTDIR if BUILDROOT has not been set
SCRIPTDIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 || exit $? ; pwd -P)"
BUILDROOT="${BUILDROOT:=$SCRIPTDIR}" BUILDROOT="${BUILDROOT:=$SCRIPTDIR}"
FILESDIR="${FILESDIR:=$BUILDROOT/files}" FILESDIR="${FILESDIR:=$BUILDROOT/files}"