[PATCH 2/4] buildscript: copy the (optional) -eu/-us factory images

[Tobias Klaus]

Hey,

Reviewed-by: Tobias Klaus <tk+ff at meskal.net>

Grüße
Tobias

Am Freitag, 6. Januar 2017, 14:15:56 CET schrieb Tim Niemeyer:
> Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> ---
> 
>  buildscript | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/buildscript b/buildscript
> index 68f7407..7e56ba7 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -278,14 +278,16 @@ cp_firmware() {
>          filename_build=${filename_build//generic/g}
>          cp "$target/bin/${chipset}/$image" "./bin/$filename_build"
> 
> -        image_factory=${image/sysupgrade/factory}
> -        if [[ -f "$target/bin/${chipset}/$image_factory" ]]; then
> -          filename_build_factory=${filename_build/sysupgrade/factory}
> -          if [ ${#image_factory} -lt ${#filename_build_factory} ]; then
> -            echo "Warning: The factory image file name
> (${filename_build_factory}) is longer than the OpenWrt one, which might be
> incompatibility with the stock firmware." -          fi
> -          cp "$target/bin/${chipset}/$image_factory"
> "./bin/$filename_build_factory" -        fi
> +        for region in "" "-eu" "-us"; do
> +            image_factory=${image/sysupgrade/factory$region}
> +            if [[ -f "$target/bin/${chipset}/$image_factory" ]]; then
> +             
> filename_build_factory=${filename_build/sysupgrade/factory$region} +       
>       if [ ${#image_factory} -lt ${#filename_build_factory} ]; then +      
>          echo "Warning: The factory image file name
> (${filename_build_factory}) is longer than the OpenWrt one, which might be
> incompatibility with the stock firmware." +              fi
> +              cp "$target/bin/${chipset}/$image_factory"
> "./bin/$filename_build_factory" +            fi
> +        done
>      done
>  }