diff options
| -rwxr-xr-x | sbodl | 2 | ||||
| -rwxr-xr-x | sbolint | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -145,7 +145,7 @@ for dl in $DL; do if [ -e "$FILE" ]; then GOTSUM="$( md5sum "$FILE" | cut -d' ' -f1 )" if [ "$1" != "$GOTSUM" ]; then - echo -e "${RED}WARN: md5sum doesn't match${COLOR_OFF}\\n expected: $1\\n got: $GOTSUM" + echo -e "${RED}WARN: md5sum doesn't match${COLOR_OFF}\\n expected: $1\\n got: $GOTSUM" else echo -e "${GREEN}md5sum matches OK${COLOR_OFF}: $1" fi @@ -1262,7 +1262,8 @@ sub check_script { } } elsif(/^PKG=(\S+)/) { $pkg = dequote($1); - if($pkg ne '$TMP/package-$PRGNAM') { + $pkg =~ s,\$\{([A-Z]+)\},\$$1,; # de-brace + if($pkg ne '$TMP/package-$PRGNAM' && $pkg ne '$TMP/package-${PRGNAM}') { log_error("$file:$lineno: PKG=\$TMP/package-\$PRGNAM is required"); } } elsif(/^OUTPUT=(\S+)/) { @@ -1333,7 +1334,7 @@ sub check_script { $old_arch = $lineno; } - if(/-march=['"]?i[34]86/) { + if(/^[^#]*\s-march=['"]?i[34]86/) { $old_flags = $lineno; } |