Skip to content

Commit

Permalink
xbps-src: allow loading xbp-src.conf from XDG compliant dirs
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnnynator committed May 8, 2020
1 parent fc3d2c5 commit e4c7789
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
those defined in `etc/defaults.conf`, set them on `etc/conf` instead i.e:
Expand Down
4 changes: 4 additions & 0 deletions xbps-src
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,10 @@ else
elif [ -s $XBPS_DISTDIR/etc/conf ]; then
# ... otherwise read generic user configuration...
readonly XBPS_CONFIG_FILE=$XBPS_DISTDIR/etc/conf
elif [ -s $XDG_CONFIG_HOME/xbps-src.conf ]; then
readonly XBPS_CONFIG_FILE=$XDG_CONFIG_HOME/xbps-src.conf
elif [ -s $HOME/.config/xbps-src.conf ]; then
readonly XBPS_CONFIG_FILE=$HOME/.config/xbps-src.conf
elif [ -s $HOME/.xbps-src.conf ]; then
# ... fallback to ~/.xbps-src.conf otherwise.
readonly XBPS_CONFIG_FILE=$HOME/.xbps-src.conf
Expand Down

0 comments on commit e4c7789

Please sign in to comment.