diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2017-03-28 18:34:42 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2017-04-05 14:42:43 -0400 |
| commit | 7eefbd294efa5b226fc60953ee2e92f1641fdeea (patch) | |
| tree | 03bee4c28d894f7dec0266a37d469ce5e8f4b6c1 | |
| parent | 285084879f195c7dab75dc8ddb9c4895ab98f9ec (diff) | |
| download | devtools32-7eefbd294efa5b226fc60953ee2e92f1641fdeea.tar.xz | |
Handle makepkg.conf more consistently
- checkpkg: Check ~/.config/pacman/makepkg.conf ; not just
~/.makepkg.conf
- commitpkg: Likewise
- rebuildpkgs: Check for user makepkg.conf files, not just the system
one in /etc
| -rw-r--r-- | checkpkg.in | 6 | ||||
| -rw-r--r-- | commitpkg.in | 6 | ||||
| -rw-r--r-- | rebuildpkgs.in | 7 |
3 files changed, 15 insertions, 4 deletions
diff --git a/checkpkg.in b/checkpkg.in index fbd30d3..ec58ff6 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -13,8 +13,10 @@ else fi # Source user-specific makepkg.conf overrides -if [[ -r ~/.makepkg.conf ]]; then - source ~/.makepkg.conf +if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then + source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" +elif [[ -r "$HOME/.makepkg.conf" ]]; then + source "$HOME/.makepkg.conf" fi if [[ ! -f PKGBUILD ]]; then diff --git a/commitpkg.in b/commitpkg.in index d31f6ba..1f9492c 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -11,8 +11,10 @@ else fi # Source user-specific makepkg.conf overrides -if [[ -r ~/.makepkg.conf ]]; then - . ~/.makepkg.conf +if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then + source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" +elif [[ -r "$HOME/.makepkg.conf" ]]; then + source "$HOME/.makepkg.conf" fi cmd=${0##*/} diff --git a/rebuildpkgs.in b/rebuildpkgs.in index 8a141e0..9197231 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -26,6 +26,13 @@ else die '/etc/makepkg.conf not found!' fi +# Source user-specific makepkg.conf overrides +if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then + source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" +elif [[ -r "$HOME/.makepkg.conf" ]]; then + source "$HOME/.makepkg.conf" +fi + bump_pkgrel() { # Get the current pkgrel from SVN and update the working copy with it # This prevents us from incrementing out of control :) |