diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-01 05:50:14 +0000 |
---|---|---|
committer | Luca Boccassi <bluca@debian.org> | 2020-03-05 21:04:23 +0000 |
commit | f3209fead217bc82754e6827330299eba4ac12ca (patch) | |
tree | 747f5c784a45e3deb417f2a57f0133f31e4e71cc /scripts/build/binary_onie | |
parent | c90749056f8f849bdc8e599803d41848faef94b4 (diff) | |
download | vyos-live-build-f3209fead217bc82754e6827330299eba4ac12ca.tar.gz vyos-live-build-f3209fead217bc82754e6827330299eba4ac12ca.zip |
binarie_onie: fix missing use of echo helpers
the '.' progress stuff has been left as is. perhaps that should be removed
since its use is inconsistent compared to other scripts?
Gbp-Dch: Short
Closes: #952882
Diffstat (limited to 'scripts/build/binary_onie')
-rwxr-xr-x | scripts/build/binary_onie | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/build/binary_onie b/scripts/build/binary_onie index 965a082ec..16b86bcdd 100755 --- a/scripts/build/binary_onie +++ b/scripts/build/binary_onie @@ -166,7 +166,7 @@ IN_IMAGE="${IMAGE}" output_file="${OUT}/${IN_IMAGE}-ONIE.bin" -echo "Creating $output_file:" +Echo_message "Creating $output_file:" # prepare workspace [ -d $EXTRACTDIR ] && chmod +w -R $EXTRACTDIR @@ -208,7 +208,7 @@ case $(file --brief --mime --dereference $EXTRACTDIR/live/initrd.img | \ COMPRESS="cat" ;; *) - echo "ERROR: Unable to detect initrd compression format." + Echo_error "Unable to detect initrd compression format." exit 1 ;; esac @@ -227,13 +227,13 @@ echo -n "." KERNEL='vmlinuz' IN_KERNEL=$EXTRACTDIR/live/$KERNEL [ -r $IN_KERNEL ] || { - echo "ERROR: Unable to find kernel in ISO: $IN_KERNEL" + Echo_error "Unable to find kernel in ISO: $IN_KERNEL" exit 1 } INITRD='initrd.img' IN_INITRD=$WORKDIR/$INITRD [ -r $IN_INITRD ] || { - echo "ERROR: Unable to find initrd in ISO: $IN_INITRD" + Echo_error "Unable to find initrd in ISO: $IN_INITRD" exit 1 } @@ -305,12 +305,12 @@ echo -n "." # Repackage $INSTALLDIR into a self-extracting installer image sharch="$WORKDIR/sharch.tar" tar -C $WORKDIR -cf $sharch installer || { - echo "Error: Problems creating $sharch archive" + Echo_error "Problems creating $sharch archive" exit 1 } [ -f "$sharch" ] || { - echo "Error: $sharch not found" + Echo_error "$sharch not found" exit 1 } echo -n "." @@ -319,7 +319,7 @@ sha1=$(cat $sharch | sha1sum | awk '{print $1}') echo -n "." cp sharch_body.sh $output_file || { - echo "Error: Problems copying sharch_body.sh" + Echo_error "Problems copying sharch_body.sh" exit 1 } |