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

makepkg: set default value for PACKAGER

Browse source 
In write_pkginfo, we checked if $PACKAGER was undefined, and gave a default
value if not.  Just do this upfront to simplify this function.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2017-07-06 13:34:31 +10:00
parent 1c8b3f2562
commit 9ab44178f4
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/makepkg.sh.in
View file

@ -622,12 +622,6 @@ write_kv_pair() {
} }
write_pkginfo() { write_pkginfo() {
if [[ -n $PACKAGER ]]; then
local packager="$PACKAGER"
else
local packager="Unknown Packager"
fi
local size="$(@DUPATH@ @DUFLAGS@)" local size="$(@DUPATH@ @DUFLAGS@)"
size="$(( ${size%%[^0-9]*} * 1024 ))" size="$(( ${size%%[^0-9]*} * 1024 ))"
@ -651,7 +645,7 @@ write_pkginfo() {
write_kv_pair "pkgdesc" "$spd" write_kv_pair "pkgdesc" "$spd"
write_kv_pair "url" "$url" write_kv_pair "url" "$url"
write_kv_pair "builddate" "$SOURCE_DATE_EPOCH" write_kv_pair "builddate" "$SOURCE_DATE_EPOCH"
write_kv_pair "packager" "$packager" write_kv_pair "packager" "$PACKAGER"
write_kv_pair "size" "$size" write_kv_pair "size" "$size"
write_kv_pair "arch" "$pkgarch" write_kv_pair "arch" "$pkgarch"
@ -1430,6 +1424,7 @@ PKGEXT=${_PKGEXT:-$PKGEXT}
SRCEXT=${_SRCEXT:-$SRCEXT} SRCEXT=${_SRCEXT:-$SRCEXT}
GPGKEY=${_GPGKEY:-$GPGKEY} GPGKEY=${_GPGKEY:-$GPGKEY}
PACKAGER=${_PACKAGER:-$PACKAGER} PACKAGER=${_PACKAGER:-$PACKAGER}
PACKAGER=${PACKAGER:-"Unknown Packager"} #default if undefined
CARCH=${_CARCH:-$CARCH} CARCH=${_CARCH:-$CARCH}
if (( ! INFAKEROOT )); then if (( ! INFAKEROOT )); then