Improve makepkg config loading for checkpkg and extrapkg.
Now, checkpkg and extrapkg will fail if /etc/makepkg.conf doesn't exist, and will also try to load in personal user's settings in ~/.makepkg.conf Signed-off-by: Travis Willard <travis@archlinux.org> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
parent
d853dee3ed
commit
6748570413
13
checkpkg
13
checkpkg
|
@ -1,6 +1,17 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
source /etc/makepkg.conf
|
# Source makepkg.conf; fail if it is not found
|
||||||
|
if [ -r "/etc/makepkg.conf" ]; then
|
||||||
|
source "/etc/makepkg.conf"
|
||||||
|
else
|
||||||
|
echo "/etc/makepkg.conf not found!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Source user-specific makepkg.conf overrides
|
||||||
|
if [ -r ~/.makepkg.conf ]; then
|
||||||
|
source ~/.makepkg.conf
|
||||||
|
fi
|
||||||
|
|
||||||
strip_url() {
|
strip_url() {
|
||||||
echo $1 | sed 's|^.*://.*/||g'
|
echo $1 | sed 's|^.*://.*/||g'
|
||||||
|
|
13
extrapkg
13
extrapkg
|
@ -1,6 +1,17 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
source /etc/makepkg.conf
|
# Source makepkg.conf; fail if it is not found
|
||||||
|
if [ -r "/etc/makepkg.conf" ]; then
|
||||||
|
source "/etc/makepkg.conf"
|
||||||
|
else
|
||||||
|
echo "/etc/makepkg.conf not found!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Source user-specific makepkg.conf overrides
|
||||||
|
if [ -r ~/.makepkg.conf ]; then
|
||||||
|
source ~/.makepkg.conf
|
||||||
|
fi
|
||||||
|
|
||||||
cmd=`basename $0`
|
cmd=`basename $0`
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue