Explorar el Código

Multi-profile support

bryan hace 2 años
padre
commit
c6158f241e
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. 2 1
      openwrtbuilder

+ 2 - 1
openwrtbuilder

@@ -616,11 +616,12 @@ main() {
         declare -gn P_ARR="$profile"
 
         debug "P_ARR: ${P_ARR[*]}"
+        debug "HERE: "${P_ARR}
 
         : "${BUILDDIR:=$SCRIPTDIR}"
         : "${FILESDIR:=$BUILDDIR/files}"
 
-        : "${USER_RELEASE:=P_ARR[release]:=$RELEASE}" # precedence: user input>profiles>env>hardcode
+        : "${P_ARR[release]:=USER_RELEASE:=$RELEASE}" # precedence: profile>user input>env>hardcode
         : "${P_ARR[source_archive]:=$BUILDDIR/sources/${P_ARR[profile]}-${P_ARR[release]}.tar.xz}"
         : "${P_ARR[source_dir]:=${P_ARR[source_archive]%.tar.xz}}"
         : "${P_ARR[out_bin_dir]:=$BUILDDIR/bin/${P_ARR[profile]}-${P_ARR[release]}}"