diff --git a/test/merge_debian_isos b/test/merge_debian_isos index 02cdb63f..4ba33e63 100755 --- a/test/merge_debian_isos +++ b/test/merge_debian_isos @@ -27,9 +27,9 @@ usage() { echo "if they are needed and do not exist when the script starts." >&2 echo "It depends on the following programs:" >&2 echo " awk, basename, cat, chmod, cp, dirname, expr, fgrep, grep," >&2 - echo " gunzip, gzip, head, ls, mkdir, mount, mv, rm, rmdir, sed, sh," >&2 - echo " sha256sum, sort, stat, sudo, umount, xorriso" >&2 - echo "Recommended are: md5sum, sha1sum, sha512sum" >&2 + echo " gunzip, gzip, head, ls, md5sum, mkdir, mount, mv, rm, rmdir," >&2 + echo " sed, sh, sha256sum, sort, stat, sudo, umount, xorriso" >&2 + echo "Recommended are: sha1sum, sha512sum" >&2 echo >&2 echo "Exported non-empty variable MERGE_DATE enforces a particular" >&2 echo "date string in the text which gets prepended to /README.txt ." >&2 @@ -240,7 +240,7 @@ echo >&2 echo "$(basename "$0") starting with $(expr $# - 2) ISO image files ..." >&2 dep="awk basename cat chmod cp dirname expr fgrep grep" -dep="$dep gunzip gzip head ls mkdir mount mv rm rmdir sed" +dep="$dep gunzip gzip head ls md5sum mkdir mount mv rm rmdir sed" dep="$dep sha256sum sort stat sudo umount" missing=0 for i in $dep @@ -259,8 +259,11 @@ then fi if test "$XORRISO" = dummy then - echo 'NOTE: Variable XORRISO is set to "dummy".' >&2 - echo ' Will not perform xorriso run but only show its arguments.' >&2 + if test "$missing" = 0 + then + echo 'NOTE: Variable XORRISO is set to "dummy".' >&2 + echo ' Will not perform xorriso run but only show its arguments.' >&2 + fi elif "$XORRISO" -no_rc -version >/dev/null 2>&1 then if "$XORRISO" -no_rc -help 2>/dev/null | fgrep '"replay"' >/dev/null 2>&1 diff --git a/test/merge_debian_isos.sig b/test/merge_debian_isos.sig index 956dc495..733cc444 100644 Binary files a/test/merge_debian_isos.sig and b/test/merge_debian_isos.sig differ