Configure 4.3.4

parent 59384a03
......@@ -14,7 +14,7 @@ APP_VERSION=9.2
APP_CODENAME="Galvanize"
APP_LANGUAGES="de"
CFG_VERSION="4.3.3"
CFG_VERSION="4.3.4"
if [[ -d "/usr/lib/girepository-1.0/" ]]; then
export GIRPATH="/usr/lib/girepository-1.0/"
......@@ -23,8 +23,6 @@ elif [[ -d "/usr/lib64/girepository-1.0/" ]]; then
fi
PREFIX="/usr"
MODE=user
QUIET=false
PYTHON=$(which python3 || which python2 || which python)
BINDIR="${PREFIX}/bin"
......@@ -32,6 +30,12 @@ PCDIR="${PREFIX}/share/pkgconfig/"
DATADIR="${PREFIX}/share/"
PROFILEDIR="/etc/"
PYMINVER_P="2.7.0"
PYMAXVER_P="3.5.0"
PYMINVER=${PYMINVER_P//.}
PYMAXVER=${PYMAXVER_P//.}
for lang in ${APP_LANGUAGES[@]}; do
LC_MESSAGES_DIRS="${LC_MESSAGES_DIRS} ${lang}/LC_MESSAGES/"
done
......
......@@ -129,8 +129,6 @@ check_python () {
fail_message p
kill -s TERM ${TOP_PID}
else
PYMINVER=270
PYMAXVER=350
PYVER=$(${PYTHON} --version 2>&1 | gawk '{ gsub(/\./,""); gsub(/\+/,""); gsub(/rc.*/,""); print $2 }')
if [[ ${PYVER:0:3} -lt ${PYMINVER} ]]; then
fail_message p-
......
......@@ -11,21 +11,19 @@
section_message () {
if [[ ${QUIET} != true ]]; then
case ${1} in
APP ) echo -e "\n${RED}< Required ${WHITE}Applications" ;;
OPT_APP ) echo -e "\n${MAGENTA}< Optional ${WHITE}Applications" ;;
SBINAPP ) echo -e "\n${RED}< Required ${WHITE}SuperUser Applications" ;;
OPT_SBINAPP ) echo -e "\n${MAGENTA}< Optional ${WHITE}SuperUser Applications" ;;
PY ) echo -e "\n${RED}< Python Interpreter${WHITE} > 2.6 && < 3.5" ;;
PYMOD ) echo -e "\n${RED}< Required ${WHITE}Python Modules" ;;
OPT_PYMOD ) echo -e "\n${MAGENTA}< Optional ${WHITE}Python Modules" ;;
LIB ) echo -e "\n${RED}< Required ${WHITE}Libraries" ;;
OPT_LIB ) echo -e "\n${MAGENTA}< Optional ${WHITE}Libraries" ;;
GIR ) echo -e "\n${RED}< Required ${WHITE}GIR Repositories" ;;
OPT_GIR) echo -e "\n${MAGENTA}< Optional ${WHITE}GIR Repositories" ;;
esac
fi
case ${1} in
APP ) echo -e "\n${RED}< Required ${WHITE}Applications" ;;
OPT_APP ) echo -e "\n${MAGENTA}< Optional ${WHITE}Applications" ;;
SBINAPP ) echo -e "\n${RED}< Required ${WHITE}SuperUser Applications" ;;
OPT_SBINAPP ) echo -e "\n${MAGENTA}< Optional ${WHITE}SuperUser Applications" ;;
PY ) echo -e "\n${RED}< Python Interpreter${WHITE} > ${PYMINVER_P} && < ${PYMAXVER_P}" ;;
PYMOD ) echo -e "\n${RED}< Required ${WHITE}Python Modules" ;;
OPT_PYMOD ) echo -e "\n${MAGENTA}< Optional ${WHITE}Python Modules" ;;
LIB ) echo -e "\n${RED}< Required ${WHITE}Libraries" ;;
OPT_LIB ) echo -e "\n${MAGENTA}< Optional ${WHITE}Libraries" ;;
GIR ) echo -e "\n${RED}< Required ${WHITE}GIR Repositories" ;;
OPT_GIR) echo -e "\n${MAGENTA}< Optional ${WHITE}GIR Repositories" ;;
esac
tput sgr0
}
......@@ -39,11 +37,9 @@ start_message () {
ok_message () {
if [[ ${QUIET} != true ]]; then
if [[ ${2} != "" ]]; then
echo -e "${WHITE}\t+ ${CYAN}${1}${MAGENTA} >${GREEN} OK${SILVER} ( ${2} )"
else echo -e "${WHITE}\t+ ${CYAN}${1}${MAGENTA} >${GREEN} OK"
fi
if [[ ${2} != "" ]]; then
echo -e "${WHITE}\t+ ${CYAN}${1}${MAGENTA} >${GREEN} OK${SILVER} ( ${2} )"
else echo -e "${WHITE}\t+ ${CYAN}${1}${MAGENTA} >${GREEN} OK"
fi
tput sgr0
}
......@@ -52,10 +48,10 @@ fail_message () {
case ${1} in
m ) echo -e "${WHITE}\t+ ${CYAN}${2}${MAGENTA} >${RED} !MISSING!" ;;
o ) echo -e "${WHITE}\t+ ${CYAN}${2}${MAGENTA} >${RED} !OLDER THAN $3!" ;;
o ) echo -e "${WHITE}\t+ ${CYAN}${2}${MAGENTA} >${RED} !OLDER THAN ${3}!" ;;
p ) echo -e "${WHITE}\t+ ${CYAN}Python ($PYTHON)${MAGENTA} >${RED} !MISSING!" ;;
p- ) echo -e "${WHITE}\t+ ${CYAN}Python ($PYTHON)${MAGENTA} >${RED} !OLDER THAN 2.7.0!" ;;
p+ ) echo -e "${WHITE}\t+ ${CYAN}Python ($PYTHON)${MAGENTA} >${RED} !IS 3.5 OR ABOVE!" ;;
p- ) echo -e "${WHITE}\t+ ${CYAN}Python ($PYTHON)${MAGENTA} >${RED} !OLDER THAN ${PYMINVER_P}!" ;;
p+ ) echo -e "${WHITE}\t+ ${CYAN}Python ($PYTHON)${MAGENTA} >${RED} !IS ${PYMAXVER_P} OR ABOVE!" ;;
esac
tput sgr0
......@@ -109,9 +105,8 @@ help_message () {
${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}--no-postinstall${WHITE} *|${GREEN} Disable post-installation tasks (for package-maintainers)
${ORANGE}--quiet${WHITE} *|${GREEN} Only display warnings, failures and results
${ORANGE}--bashrc=<bashrc>${WHITE} *|${GREEN} Path to system bashrc (default: /etc/bashrc or /etc/bash.bashrc)" | column -t -s \*
${ORANGE}--bashrc=<bashrc>${WHITE} *|${GREEN} Path to system bashrc (default: /etc/bashrc or /etc/bash.bashrc)
${ORANGE}--no-postinstall${WHITE} *|${GREEN} Disable post-installation tasks (for package-maintainers) " | column -t -s \*
tput sgr0
}
......
Overview of changes in v9.2 "Galvanize"
=== Configure 4.3.4 ===
- remove --quiet switch
- globally define PYMAXVER and PYMINVER (python minimum and maximum versions)
- globally define PYAMXVER_P and PYMINVER_P (printable python minimum and
maximum python versions for configure messages)
- remove unused variable
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Overview of changes in v9.1 "Dial T for TNT"
=== Bug Fixes ===
......
......@@ -31,7 +31,6 @@ while [[ ${xcount} -lt $# ]]; do
--datadir=* ) DATADIR="${1/*=}" ;;
--python=* ) PYTHON="${1/*=}" ;;
--bashrc=* ) BASHFILE="${1/*=}" ;;
--quiet ) QUIET=true ;;
--help ) MODE=help ;;
--no-postinstall ) DISABLE_POSTINSTALL=1
echo "DISABLE_POSTINSTALL=1" >> \
......
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