[arch-commits] Commit in pacman/trunk (PKGBUILD)
Dave Reisner
dreisner at nymeria.archlinux.org
Fri Jan 3 17:32:40 UTC 2014
Date: Friday, January 3, 2014 @ 18:32:40
Author: dreisner
Revision: 203077
be pedantic about quoting
Modified:
pacman/trunk/PKGBUILD
----------+
PKGBUILD | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-01-03 12:12:14 UTC (rev 203076)
+++ PKGBUILD 2014-01-03 17:32:40 UTC (rev 203077)
@@ -31,7 +31,7 @@
'f4940a8003ebd11e514827a790ef4e7f')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$pkgname-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --enable-doc \
@@ -46,16 +46,17 @@
}
package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
- make DESTDIR=$pkgdir -C contrib install
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C contrib install
+
# install Arch specific stuff
- install -dm755 $pkgdir/etc
- install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
-
- case "$CARCH" in
- i686)
+ install -dm755 "$pkgdir/etc"
+ install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf"
+
+ case $CARCH in
+ i686)
mycarch="i686"
mychost="i686-pc-linux-gnu"
myflags="-march=i686"
@@ -66,18 +67,18 @@
myflags="-march=x86-64"
;;
esac
- install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+
# set things correctly in the default conf file
- sed -i $pkgdir/etc/makepkg.conf \
+ install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
+ sed -i "$pkgdir/etc/makepkg.conf" \
-e "s|@CARCH[@]|$mycarch|g" \
-e "s|@CHOST[@]|$mychost|g" \
-e "s|@CARCHFLAGS[@]|$myflags|g"
-
+
# put bash_completion in the right location
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/pacman \
- ${pkgdir}/usr/share/bash-completion/completions
- rmdir ${pkgdir}/etc/bash_completion.d
+ install -dm755 "$pkgdir/usr/share/bash-completion/completions"
+ mv "$pkgdir/etc/bash_completion.d/pacman" "$pkgdir/usr/share/bash-completion/completions"
+ rmdir "$pkgdir/etc/bash_completion.d"
for f in makepkg pacman-key; do
ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
More information about the arch-commits
mailing list