diff options
| author | Nezmer <git@nezmer.info> | 2010-10-12 02:23:16 +0300 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-10-11 20:29:22 -0500 |
| commit | 05f0a28932c1acab7a9ddb58435d69626dad54da (patch) | |
| tree | 86b901ee3ba6fc6ba6d7219de38e68d70d092742 /contrib/bacman.in | |
| parent | bce3c8efc7a2d187984aa0e7037307b99c217fd7 (diff) | |
| download | pacman-05f0a28932c1acab7a9ddb58435d69626dad54da.tar.xz | |
Use sysconfdir, localstatedir, BASH instead of hardcoded values
This applies to contrib/ files, our scripts, and the documentation.
Dan: fix 'make clean' in contrib/ directory.
Signed-off-by: Nezmer <git@nezmer.info>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'contrib/bacman.in')
| -rwxr-xr-x | contrib/bacman.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/bacman.in b/contrib/bacman.in index 6dd78394..2a93f8be 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # bacman: recreate a package from a running system # This script rebuilds an already installed package using metadata @@ -67,20 +67,20 @@ fi # # Setting environmental variables # -if [ ! -r /etc/pacman.conf ]; then - echo "ERROR: unable to read /etc/pacman.conf" +if [ ! -r @sysconfdir@/pacman.conf ]; then + echo "ERROR: unable to read @sysconfdir@/pacman.conf" exit 1 fi -eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) -pac_db="${DBPath:-/var/lib/pacman/}/local" +eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) +pac_db="${DBPath:-@localstatedir@/lib/pacman/}/local" -if [ ! -r /etc/makepkg.conf ]; then - echo "ERROR: unable to read /etc/makepkg.conf" +if [ ! -r @sysconfdir@/makepkg.conf ]; then + echo "ERROR: unable to read @sysconfdir@/makepkg.conf" exit 1 fi -source "/etc/makepkg.conf" +source "@sysconfdir@/makepkg.conf" if [ -r ~/.makepkg.conf ]; then source ~/.makepkg.conf fi |