Browse Source

fix resetting the buildtasks array inside the build cross toolchain loop (v0.9.3)

pull/9/head
WXbet 5 years ago
committed by GitHub
parent
commit
454d3e1ca3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      support/functions/_plugin_update_toolchain

6
support/functions/_plugin_update_toolchain

@ -5,7 +5,7 @@
tcupdate(){ tcupdate(){
clear && _check_bin; clear && _check_bin;
pversion="0.9.2"; pversion="0.9.3";
pname="s3.TUP"; pname="s3.TUP";
pdesc="Plugin $pname v$pversion"; pdesc="Plugin $pname v$pversion";
configname="$configdir/plugin_update_toolchain.config"; configname="$configdir/plugin_update_toolchain.config";
@ -239,6 +239,7 @@ _create_tc(){
0) #Start - Build cross toolchain 0) #Start - Build cross toolchain
if [ -f "$ctsrcdir/ct-ng" ]; then if [ -f "$ctsrcdir/ct-ng" ]; then
icount=$(echo $opts | wc -w);i=0; icount=$(echo $opts | wc -w);i=0;
for tpl in $opts;do for tpl in $opts;do
if [ -f "$cttpldir/$tpl" ]; then if [ -f "$cttpldir/$tpl" ]; then
@ -269,10 +270,11 @@ _create_tc(){
cd "$ctsrcdir"; cd "$ctsrcdir";
#generate build command list #generate build command list
unset buildtasks;
for task in "${CTNG_BUILD_tasks[@]}";do for task in "${CTNG_BUILD_tasks[@]}";do
task=$(_replace_tokens "$task"); #replace tokens task=$(_replace_tokens "$task"); #replace tokens
buildtasks+=("$task"); buildtasks+=("$task");
done done;
( eval "${buildtasks[@]}" ) 2>&1; ( eval "${buildtasks[@]}" ) 2>&1;
err=$(grep '\[ERROR\]' "$ctsrcdir/build.log" | wc -l) err=$(grep '\[ERROR\]' "$ctsrcdir/build.log" | wc -l)

Loading…
Cancel
Save