bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add -m/--nocolor options to updpkgsums

Browse source 
Fixes FS#43346

Signed-off-by: Ashley Whetter <ashley@awhetter.co.uk>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Ashley Whetter 2016-05-01 18:03:08 +01:00 • committed by Allan McRae
parent 6c96ad36e0
commit b012da645e
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
contrib/updpkgsums.sh.in
View file

@ -29,10 +29,13 @@ usage() {
echo "path specified by [build file], defaulting to PKGBUILD in the current" echo "path specified by [build file], defaulting to PKGBUILD in the current"
echo "working directory." echo "working directory."
echo echo
printf "Usage: %s [build file]\n" "${myname}" printf "Usage: %s [options] [build file]\n" "${myname}"
echo echo
echo " -h, --help display this help message and exit" echo " -h, --help display this help message and exit"
echo " -V, --version display version information and exit" echo " -V, --version display version information and exit"
echo
echo "These options can be passed to makepkg:"
echo " -m, --nocolor disable colorized output messages"
} }
version() { version() {
@ -45,12 +48,18 @@ die() {
exit 1 exit 1
} }
case $1 in MAKEPKG_OPTS=()
-h|--help) usage; exit ;; buildfile='PKGBUILD'
-V|--version) version; exit ;;
esac while (( "$#" )); do
case "$1" in
-h|--help) usage; exit ;;
-m|--nocolor) MAKEPKG_OPTS+=("$1"); shift ;;
-V|--version) version; exit ;;
*) buildfile="$1"; break 2 ;;
esac
done
buildfile=${1:-PKGBUILD}
if [[ ! -f $buildfile ]]; then if [[ ! -f $buildfile ]]; then
die "%s not found or is not a file" "$buildfile" die "%s not found or is not a file" "$buildfile"
fi fi
@ -83,7 +92,7 @@ export BUILDDIR=$(mktemp -d "${TMPDIR:-/tmp}/updpkgsums.XXXXXX")
newbuildfile=$(mktemp "${TMPDIR:-/tmp}/updpkgsums.XXXXXX") newbuildfile=$(mktemp "${TMPDIR:-/tmp}/updpkgsums.XXXXXX")
trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT
newsums=$(makepkg -g -p "$buildfile") || die 'Failed to generate new checksums' newsums=$(makepkg -g -p "$buildfile" "${MAKEPKG_OPTS[@]}") || die 'Failed to generate new checksums'
awk -v newsums="$newsums" ' awk -v newsums="$newsums" '
/^[[:blank:]]*(md|sha)[[:digit:]]+sums(_[^=]+)?=/,/\)[[:blank:]]*(#.*)?$/ { /^[[:blank:]]*(md|sha)[[:digit:]]+sums(_[^=]+)?=/,/\)[[:blank:]]*(#.*)?$/ {
if (!w) { if (!w) {