Handle makepkg.conf more consistently
This commit is contained in:
parent
c1a056c9a8
commit
6098253f6f
|
@ -13,8 +13,10 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Source user-specific makepkg.conf overrides
|
# Source user-specific makepkg.conf overrides
|
||||||
if [[ -r ~/.makepkg.conf ]]; then
|
if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then
|
||||||
source ~/.makepkg.conf
|
source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
|
||||||
|
elif [[ -r "$HOME/.makepkg.conf" ]]; then
|
||||||
|
source "$HOME/.makepkg.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -f PKGBUILD ]]; then
|
if [[ ! -f PKGBUILD ]]; then
|
||||||
|
|
|
@ -11,8 +11,10 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Source user-specific makepkg.conf overrides
|
# Source user-specific makepkg.conf overrides
|
||||||
if [[ -r ~/.makepkg.conf ]]; then
|
if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then
|
||||||
. ~/.makepkg.conf
|
source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
|
||||||
|
elif [[ -r "$HOME/.makepkg.conf" ]]; then
|
||||||
|
source "$HOME/.makepkg.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cmd=${0##*/}
|
cmd=${0##*/}
|
||||||
|
|
|
@ -26,6 +26,13 @@ else
|
||||||
die '/etc/makepkg.conf not found!'
|
die '/etc/makepkg.conf not found!'
|
||||||
fi
|
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() {
|
bump_pkgrel() {
|
||||||
# Get the current pkgrel from SVN and update the working copy with it
|
# Get the current pkgrel from SVN and update the working copy with it
|
||||||
# This prevents us from incrementing out of control :)
|
# This prevents us from incrementing out of control :)
|
||||||
|
|
Loading…
Reference in New Issue