summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Giokas <1007380@gmail.com>2013-01-15 22:45:42 -0600
committerAllan McRae <allan@archlinux.org>2013-01-17 22:32:54 +1000
commitb27886ab5967c30e2e80d46e47968c9f4a95e760 (patch)
treeacb146702fffac7e57c4d7c5fe2985db1dc3379b
parent132e1ac10c7fef54372f4d8119b6cc3e82d2c957 (diff)
downloadpacman-b27886ab5967c30e2e80d46e47968c9f4a95e760.tar.xz
makepkg: Formatting consistency in write_pkginfo
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>
-rw-r--r--scripts/makepkg.sh.in12
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index ebc24f70..dcd920d1 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1710,14 +1710,12 @@ write_pkginfo() {
size="$(( ${size%%[^0-9]*} * 1024 ))"
msg2 "$(gettext "Generating %s file...")" ".PKGINFO"
- echo "# Generated by makepkg $makepkg_version"
- if (( INFAKEROOT )); then
- echo "# using $(fakeroot -v)"
- fi
- echo "# $(LC_ALL=C date -u)"
+ printf "# Generated by makepkg %s\n" "$makepkg_version"
+ (( INFAKEROOT )) && printf "# using %s\n" "$(fakeroot -v)"
+ printf "# %s\n" "$(LC_ALL=C date -u)"
printf "pkgname = %s\n" "$pkgname"
- (( SPLITPKG )) && echo pkgbase = $pkgbase
- echo "pkgver = $(get_full_version)"
+ (( SPLITPKG )) && printf "pkgbase = %s\n" "$pkgbase"
+ printf "pkgver = %s\n" "$(get_full_version)"
printf "pkgdesc = %s\n" "${pkgdesc//+([[:space:]])/ }"
printf "url = %s\n" "$url"
printf "builddate = %s\n" "$builddate"