diff options
| author | lukeshu@parabola.nu <lukeshu@parabola.nu> | 2017-04-05 15:35:57 -0400 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-04-05 22:17:51 +0200 |
| commit | 6098253f6f362909c8a9bfc972b3ea72b30428a1 (patch) | |
| tree | e6b627ff47f34730ac23b42493efae35574400c8 | |
| parent | c1a056c9a8f42e1a8e1f66b265b7ccbd1a2cb1ee (diff) | |
| download | devtools-6098253f6f362909c8a9bfc972b3ea72b30428a1.tar.gz devtools-6098253f6f362909c8a9bfc972b3ea72b30428a1.zip | |
Handle makepkg.conf more consistently
| -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 :) |