From 42ed1183c123e9afb7fddadbbc4e62d89f82b63d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 1 Oct 2014 16:50:35 -0400 Subject: conf.sh: make sysconfdir overridable at runtime, use this for testing --- src/lib/conf.sh.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/lib') diff --git a/src/lib/conf.sh.in b/src/lib/conf.sh.in index fa66016..6a2a3b0 100644 --- a/src/lib/conf.sh.in +++ b/src/lib/conf.sh.in @@ -38,29 +38,30 @@ fi # Later files should take precedence over earlier files. list_files() { local slug=$1 + local sysconfdir=${_librelib_conf_sh_sysconfdir:-@sysconfdir@} case $slug in abs) - echo @sysconfdir@/$slug.conf + echo "${sysconfdir}/$slug.conf" echo "$LIBREHOME/.$slug.conf" ;; makepkg) - if [[ ${MAKEPKG_CONF:-} != @sysconfdir@/$slug.conf && -r ${MAKEPKG_CONF:-} ]]; then + if [[ ${MAKEPKG_CONF:-} != ${sysconfdir}/$slug.conf && -r ${MAKEPKG_CONF:-} ]]; then echo "$MAKEPKG_CONF" else - echo @sysconfdir@/$slug.conf + echo "${sysconfdir}/$slug.conf" echo "$LIBREHOME/.$slug.conf" fi ;; xbs*) - echo @sysconfdir@/xbs/$slug.conf + echo "${sysconfdir}/xbs/$slug.conf" echo "$XDG_CONFIG_HOME/xbs/$slug.conf" ;; libretools) - echo @sysconfdir@/$slug.conf + echo "${sysconfdir}/$slug.conf" echo "$XDG_CONFIG_HOME/libretools/$slug.conf" ;; *) - echo @sysconfdir@/libretools.d/$slug.conf + echo "${sysconfdir}/libretools.d/$slug.conf" echo "$XDG_CONFIG_HOME/libretools/$slug.conf" ;; esac -- cgit v1.2.2