Configure 4.3.3

 - fixed bug #185
 - fixed bug #186
parent 7bb1370d
......@@ -9,9 +9,6 @@
# #
#########################################################
trap "kill -s TERM ${TOP_PID}" TERM
export TOP_PID=$$
check () {
for dir in ${PATH//:/ }; do
[[ -x ${dir}/${1} ]] && (echo found && continue 2)
......@@ -24,7 +21,7 @@ check_helper () {
[[ ${OPT_APPS[@]} ]] && (section_message OPT_APP && check_apps "true" "${OPT_APPS[@]}")
[[ ${SAPPS[@]} ]] && (section_message SBINAPP && check_apps "false" "${SAPPS[@]}")
[[ ${OPT_SAPPS[@]} ]] && (section_message OPT_SBINAPP && check_apps "true" "${OPT_SAPPS[@]}")
check_python
[[ ${PYMODS[@]} ]] && check_python
[[ ${PYMODS[@]} ]] && (section_message PYMOD && check_pymods "false" "${PYMODS[@]}")
[[ ${OPT_PYMODS[@]} ]] && (section_message OPT_PYMOD && check_pymods "true" "${OPT_PYMODS[@]}")
[[ ${LIBS[@]} ]] && (section_message LIB && check_libs "false" "${LIBS[@]}")
......@@ -135,10 +132,10 @@ check_python () {
PYMINVER=270
PYMAXVER=350
PYVER=$(${PYTHON} --version 2>&1 | gawk '{ gsub(/\./,""); gsub(/\+/,""); gsub(/rc.*/,""); print $2 }')
if [[ ${PYVER} -lt ${PYMINVER} ]]; then
if [[ ${PYVER:0:3} -lt ${PYMINVER} ]]; then
fail_message p-
kill -s TERM ${TOP_PID}
elif [[ ${PYVER} -gt ${PYMAXVER} ]]; then
elif [[ ${PYVER:0:3} -gt ${PYMAXVER} ]]; then
fail_message p+
kill -s TERM ${TOP_PID}
else
......
......@@ -98,6 +98,13 @@ Overview of changes in v9.0 "Hotride"
Bash session after program run to make readline configuration apply)
* #184 (make):
fix desktop file not beeing installed
* #185 (configure):
properly check for python version (was confused by version longer than
four digits, for example 2.7.10 which translated to 2710)
* #186 (configure):
properly exit configure if a dependency was not met in all cases
(for example did not exit when the found python interpreter's
version did exceed the maximum version or was below the minimum)
=== Wizard-Merge ===
......@@ -214,7 +221,7 @@ The following shell functions have been removed
- options now have a tooltip with a description on it's meaning (work in progress)
- removed "Reset Bash History" button
=== Configure 4.3.2 ===
=== Configure 4.3.3 ===
* minor code improvements
* output message changes
......
......@@ -10,6 +10,7 @@
#########################################################
shopt -s extglob
export TOP_PID=$$
MODULES=( base color messages checks substitute depends )
......
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