Configure 4.3.5

parent 2e17b078
......@@ -14,7 +14,7 @@ APP_VERSION=9.2
APP_CODENAME="Galvanize"
APP_LANGUAGES="de"
CFG_VERSION="4.3.4"
CFG_VERSION="4.3.5"
if [[ -d "/usr/lib/girepository-1.0/" ]]; then
export GIRPATH="/usr/lib/girepository-1.0/"
......@@ -28,7 +28,6 @@ PYTHON=$(which python3 || which python2 || which python)
BINDIR="${PREFIX}/bin"
PCDIR="${PREFIX}/share/pkgconfig/"
DATADIR="${PREFIX}/share/"
PROFILEDIR="/etc/"
PYMINVER_P="2.7.0"
PYMAXVER_P="3.5.0"
......@@ -49,7 +48,6 @@ export_result ()
echo -e "PREFIX=\"${PREFIX}\"
DATADIR=\"${DATADIR}/bashstyle-ng/\"
DATADIR_LIST=( ui rc/{functions,internal,settings,styles} termcap/{bar,body} vim/colors )
PROFILEDIR=\"${PROFILEDIR}/\"
BINDIR=\"${BINDIR}\"
LOCALEDIR=\"${DATADIR}/locale/\"
LOCALEDIR_LIST=( ${LC_MESSAGES_DIRS} )
......
......@@ -82,10 +82,6 @@ end_message () {
echo -e "${YELLOW}Post-Install Tasks\t${WHITE}>${RED} Disabled"
else echo -e "${YELLOW}Post-Install Tasks\t${WHITE}>${GREEN} Enabled"
fi
if [[ ${BASHFILE_AUTO} ]]; then
echo -e "${YELLOW}System Bashrc\t\t${WHITE}>${MAGENTA} ${BASHFILE} ${RED}(auto detect)"
else echo -e "${YELLOW}System Bashrc\t\t${WHITE}>${MAGENTA} ${BASHFILE} ${GREEN}(user set)"
fi
echo
tput sgr0
......@@ -102,7 +98,6 @@ help_message () {
${ORANGE}--docdir=<docdir>${WHITE} *|${GREEN} Change doc path (default: /usr/share/doc/)
${ORANGE}--datadir=<datadir>${WHITE} *|${GREEN} Change data path (default: /usr/share/)
${ORANGE}--pcdir=<pcdir>${WHITE} *|${GREEN} Change pkg-config path (default: /usr/share/pkgconfig)
${ORANGE}--profiledir=<profiledir>${WHITE} *|${GREEN} Change profile path (default: /etc/)
${ORANGE}--girpath=<girpath>${WHITE} *|${GREEN} Where to look G-I typelibs (default: /usr/lib/girepository-1.0/)
${ORANGE}--python=<python>${WHITE} *|${GREEN} Make BashStyle-NG use a specific python (default: /usr/bin/python)
${ORANGE}--bashrc=<bashrc>${WHITE} *|${GREEN} Path to system bashrc (default: /etc/bashrc or /etc/bash.bashrc)
......
......@@ -9,7 +9,7 @@
# #
#########################################################
IN_FILES=( rc/nx-rc data/bashstyle data/bashstyle-ng.pc data/bashstyle.sh )
IN_FILES=( rc/nx-rc data/bashstyle data/bashstyle-ng.pc )
copy_in_files () {
......@@ -24,8 +24,7 @@ substitute_values () {
sed -e "s>@VERSION@>${APP_VERSION}>g" \
-e "s>@PREFIX@>${PREFIX}>g" \
-e "s>@DATADIR@>${DATADIR}>g" \
-e "s>@PYTHON@>${PYTHON}>g" \
-e "s>@PROFILEDIR@>${PROFILEDIR}>g" -i ${IN_FILES[@]}
-e "s>@PYTHON@>${PYTHON}>g" -i ${IN_FILES[@]}
sed -e "s>//>/>g" -i ${IN_FILES[@]}
}
......@@ -25,7 +25,6 @@ while [[ ${xcount} -lt $# ]]; do
case ${1} in
--prefix=* ) PREFIX="${1/*=}" ;;
--pcdir=* ) PCDIR="${1/*=}" ;;
--profiledir=* ) PROFILEDIR="${1/*}" ;;
--bindir=* ) BINDIR="${1/*=}" ;;
--girpath=* ) GIRPATH="${1/*=}" ;;
--datadir=* ) DATADIR="${1/*=}" ;;
......@@ -48,15 +47,6 @@ else
missing_girpath_message ; exit 1
fi
if [[ ! ${BASHFILE} ]]; then
BASHFILE_AUTO=true
if [[ -e /etc/bash.bashrc ]]; then
BASHFILE=/etc/bash.bashrc
else
BASHFILE=/etc/bashrc
fi
fi
start_message
check_helper
copy_in_files
......
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