moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

makepkg: Formatting consistency in write_pkginfo

Browse Source 
The difference between the echo and the printf's in write_pkginfo seemed
to be somewhat sporadic. Also, the INFAKEROOT check was doing the same
exact thing as the SPLITPKG check, but formatted much differently and
consuming two extra lines. I think this makes it more readable than it
was previously, if nothing else.

Signed-off-by: William Giokas <1007380@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
William Giokas 2013-01-15 22:45:42 -06:00 committed by Allan McRae
parent 132e1ac10c
commit b27886ab59
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/makepkg.sh.in
View File

@ -1710,14 +1710,12 @@ write_pkginfo() {
size="$(( ${size%%[^0-9]*} * 1024 ))" size="$(( ${size%%[^0-9]*} * 1024 ))"
msg2 "$(gettext "Generating %s file...")" ".PKGINFO" msg2 "$(gettext "Generating %s file...")" ".PKGINFO"
echo "# Generated by makepkg $makepkg_version" printf "# Generated by makepkg %s\n" "$makepkg_version"
if (( INFAKEROOT )); then (( INFAKEROOT )) && printf "# using %s\n" "$(fakeroot -v)"
echo "# using $(fakeroot -v)" printf "# %s\n" "$(LC_ALL=C date -u)"
fi
echo "# $(LC_ALL=C date -u)"
printf "pkgname = %s\n" "$pkgname" printf "pkgname = %s\n" "$pkgname"
(( SPLITPKG )) && echo pkgbase = $pkgbase (( SPLITPKG )) && printf "pkgbase = %s\n" "$pkgbase"
echo "pkgver = $(get_full_version)" printf "pkgver = %s\n" "$(get_full_version)"
printf "pkgdesc = %s\n" "${pkgdesc//+([[:space:]])/ }" printf "pkgdesc = %s\n" "${pkgdesc//+([[:space:]])/ }"
printf "url = %s\n" "$url" printf "url = %s\n" "$url"
printf "builddate = %s\n" "$builddate" printf "builddate = %s\n" "$builddate"