moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: allow loading xbp-src.conf from XDG compliant dirs

Browse source
This commit is contained in:
John 2020-05-08 16:09:48 +02:00 • committed by John Zimmermann
parent 149441e8a7
commit 582046b927
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -165,7 +165,7 @@ If you don't want to waste your time building everything from scratch probably i
The `etc/defaults.conf` file contains the possible settings that can be overridden The `etc/defaults.conf` file contains the possible settings that can be overridden
through the `etc/conf` configuration file for the `xbps-src` utility; if that file through the `etc/conf` configuration file for the `xbps-src` utility; if that file
does not exist, will try to read configuration settings from `~/.xbps-src.conf`. does not exist, will try to read configuration settings from `$XDG_CONFIG_HOME/xbps-src.conf`, `~/.config/xbps-src.conf`, `~/.xbps-src.conf`.
If you want to customize default `CFLAGS`, `CXXFLAGS` and `LDFLAGS`, don't override If you want to customize default `CFLAGS`, `CXXFLAGS` and `LDFLAGS`, don't override
those defined in `etc/defaults.conf`, set them on `etc/conf` instead i.e: those defined in `etc/defaults.conf`, set them on `etc/conf` instead i.e:

2
xbps-src
View file

@ -428,6 +428,8 @@ else
elif [ -s $XBPS_DISTDIR/etc/conf ]; then elif [ -s $XBPS_DISTDIR/etc/conf ]; then
# ... otherwise read generic user configuration... # ... otherwise read generic user configuration...
readonly XBPS_CONFIG_FILE=$XBPS_DISTDIR/etc/conf readonly XBPS_CONFIG_FILE=$XBPS_DISTDIR/etc/conf
elif [ -s ${XDG_CONFIG_HOME:-$HOME/.config}/xbps-src.conf ]; then
readonly XBPS_CONFIG_FILE=${XDG_CONFIG_HOME:-$HOME/.config}/xbps-src.conf
elif [ -s $HOME/.xbps-src.conf ]; then elif [ -s $HOME/.xbps-src.conf ]; then
# ... fallback to ~/.xbps-src.conf otherwise. # ... fallback to ~/.xbps-src.conf otherwise.
readonly XBPS_CONFIG_FILE=$HOME/.xbps-src.conf readonly XBPS_CONFIG_FILE=$HOME/.xbps-src.conf