[PATCH] buildscript: check selected_bsp link target

Fabian Bläse fabian at blaese.de
Fr Apr 17 16:27:09 CEST 2020


Reviewed-by: Fabian Bläse <fabian at blaese.de>

On 17.04.20 14:21, Adrian Schmutzler wrote:
> While buildscript checks whether selected_bsp exists, it does not
> verify whether it is pointing to a sensible direction.
> 
> Since we use the target file name and content to derive build folders
> etc., though, this patch adds a check and exits the script if the
> link is broken.
> 
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> ---
>  buildscript | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/buildscript b/buildscript
> index d2da0e30..9f6217c2 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -360,7 +360,14 @@ clean() {
>  
>  loadBSP()
>  {
> -    echo "Working with $(/bin/ls -l selected_bsp | awk '{ print $11 }')"
> +    localbsppath=$(/bin/ls -l selected_bsp | awk '{ print $11 }')
> +
> +    if ! [ -s selected_bsp ]; then
> +        echo "Error: $localbsppath does not exist. Aborting ..."
> +        exit 1
> +    fi
> +
> +    echo "Working with $localbsppath"
>      . selected_bsp
>      machine=$(basename $(realpath selected_bsp) .bsp)
>  }
> 

-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 833 bytes
Beschreibung: OpenPGP digital signature
URL         : <https://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20200417/72329ef2/attachment.sig>


Mehr Informationen über die Mailingliste franken-dev