configure 4.3.3

 - remove --mode parameter and maintainer mode
 - only check for system bashrc if not running --help
 - check for python3, then python2, then python (wasn't checking python2 before)
parent e9e38743
......@@ -14,7 +14,7 @@ APP_VERSION=8.99
APP_CODENAME="Hotride"
APP_LANGUAGES="de"
CFG_VERSION="4.3.2"
CFG_VERSION="4.3.3"
if [[ -d "/usr/lib/girepository-1.0/" ]]; then
export GIRPATH="/usr/lib/girepository-1.0/"
......@@ -25,7 +25,7 @@ fi
PREFIX="/usr"
MODE=user
QUIET=false
PYTHON=$(which python3 || which python)
PYTHON=$(which python3 || which python2 || which python)
BINDIR="${PREFIX}/bin"
PCDIR="${PREFIX}/share/pkgconfig/"
......@@ -53,6 +53,6 @@ ICONDIR=\"${DATADIR}/icons/hicolor/32x32/apps/\"
DESKTOPDIR=\"${DATADIR}/applications/\"
PCDIR=\"${PCDIR}/\"
BASHFILE=\"${BASHFILE}\"
APP_LANGUAGES=\"${APP_LANGUAGES}\"" | sed -e 's,\/\/,\/,g' >> ${PWD}/.configure/results
APP_LANGUAGES=\"${APP_LANGUAGES}\"" | sed -e 's,//,/,g' >> ${PWD}/.configure/results
}
......@@ -101,7 +101,6 @@ help_message () {
\n${WHITE}Options:"
echo -e " ${ORANGE}--help${WHITE} *|${GREEN} Display this help message
${ORANGE}--mode=<mode>${WHITE} *|${GREEN} user (do checks) or maintainer (skip checks)
${ORANGE}--prefix=<prefix>${WHITE} *|${GREEN} Change installation prefix (default: /usr)
${ORANGE}--bindir=<bindir>${WHITE} *|${GREEN} Change binary path (default: /usr/bin)
${ORANGE}--docdir=<docdir>${WHITE} *|${GREEN} Change doc path (default: /usr/share/doc/)
......@@ -116,3 +115,10 @@ help_message () {
tput sgr0
}
missing_girpath_message () {
echo -e "${RED}*** GIRPATH not detected ***${WHITE}
configure --girpath=<girpath> to specify where to look for
gobject-introspection files\n"
tput sgr0
}
......@@ -22,7 +22,6 @@ rm -f ${PWD}/.configure/results
xcount=0
while [[ ${xcount} -lt $# ]]; do
case ${1} in
--mode=* ) MODE="${1/*=}" ;;
--prefix=* ) PREFIX="${1/*=}" ;;
--pcdir=* ) PCDIR="${1/*=}" ;;
--profiledir=* ) PROFILEDIR="${1/*}" ;;
......@@ -42,29 +41,22 @@ while [[ ${xcount} -lt $# ]]; do
done
unset xcount
if [[ ! ${BASHFILE} ]]; then
BASHFILE_AUTO=true
if [[ -e /etc/bash.bashrc ]]; then
BASHFILE=/etc/bash.bashrc
else
BASHFILE=/etc/bashrc
fi
fi
if [[ ${MODE} == help ]]; then
help_message
elif [[ ${GIRPATH} == "" ]]; then
echo -e "*** GIRPATH not detected ***\
\nconfigure --girpath=<girpath> to specify where to look for\
gobject-introspection files\n"
exit 1
elif [[ ${MODE} == maintainer ]]; then
maintainer_message
copy_in_files
substitute_values
end_message
export_result
elif [[ ${MODE} == user ]]; then
else
if [[ ${GIRPATH} == "" ]]; then
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