Commit 67485704 authored by Travis Willard's avatar Travis Willard Committed by Aaron Griffin
Browse files

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: default avatarTravis Willard <travis@archlinux.org>
Signed-off-by: default avatarAaron Griffin <aaronmgriffin@gmail.com>
parent d853dee3

checkpkg

+12 −1
Original line number Diff line number Diff line 
#!/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() {

	echo $1 | sed 's|^.*://.*/||g'

extrapkg

+12 −1
Original line number Diff line number Diff line 
#!/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`