rename BSNG_DATA_DIR to BSNG_DATADIR

parent eb49f086
......@@ -24,7 +24,7 @@ ini_get ()
def_get ()
{
sed -n "s/^${1} = \(.*$\)/\1/p" ${BSNG_DATA_DIR}/bashstyle-ng/bs-ng.ini | \
sed -n "s/^${1} = \(.*$\)/\1/p" ${BSNG_DATADIR}/bashstyle-ng/bs-ng.ini | \
sed -e 's/\"//g'
}
......
......@@ -13,11 +13,11 @@
TEXTDOMAIN="nx-rc"
export BSNG_PREFIX=@PREFIX@
export BSNG_DATA_DIR=@DATADIR@
export BSNG_RC_DIR=${BSNG_DATA_DIR}/bashstyle-ng/rc
export BSNG_DATADIR=@DATADIR@
export BSNG_RC_DIR=${BSNG_DATADIR}/bashstyle-ng/rc
export BSNG_VERSION=@VERSION@
export BSNG_YEAR="2007 - 2015"
INI_VERSION=22
INI_VERSION=23
source ${BSNG_RC_DIR}/internal/misc
source ${BSNG_RC_DIR}/internal/logging
......@@ -26,7 +26,7 @@ if [[ ! -f ${HOME}/.bs-ng.ini ]]; then
if [[ -f /etc/bs-ng_vendor.ini && $(ven_get ini_version) == ${INI_VERSION} ]]; then
cp /etc/bs-ng_vendor.ini ${HOME}/.bs-ng.ini
else
cp ${BSNG_DATA_DIR}/bashstyle-ng/bs-ng.ini ${HOME}/.bs-ng.ini
cp ${BSNG_DATADIR}/bashstyle-ng/bs-ng.ini ${HOME}/.bs-ng.ini
fi
fi
......
......@@ -10,13 +10,13 @@
#########################################################
if [[ ${enable_colors} == True ]]; then
if [[ -f ${BSNG_DATA_DIR}/bashstyle-ng/termcap/bar/$(ini_get termcap_bar).termcap ]]; then
if [[ -f ${BSNG_DATADIR}/bashstyle-ng/termcap/bar/$(ini_get termcap_bar).termcap ]]; then
dbg_msg $"BashStyle-NG Setting: Termcap (bar)" $(ini_get termcap_bar)
dbg_log source ${BSNG_DATA_DIR}/bashstyle-ng/termcap/bar/$(ini_get termcap_bar).termcap
dbg_log source ${BSNG_DATADIR}/bashstyle-ng/termcap/bar/$(ini_get termcap_bar).termcap
fi
if [[ -f ${BSNG_DATA_DIR}/bashstyle-ng/termcap/body/$(ini_get termcap_body).termcap ]]; then
if [[ -f ${BSNG_DATADIR}/bashstyle-ng/termcap/body/$(ini_get termcap_body).termcap ]]; then
dbg_msg $"BashStyle-NG Setting: Termcap (body)" $(ini_get termcap_body)
dbg_log source ${BSNG_DATA_DIR}/bashstyle-ng/termcap/body/$(ini_get termcap_body).termcap
dbg_log source ${BSNG_DATADIR}/bashstyle-ng/termcap/body/$(ini_get termcap_body).termcap
fi
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment