Browse Source

updatewine.sh: Fix requirements check message bug

Should not warn about insufficient RAM if more than defined in threshold
master
Pekka Helenius 5 years ago
committed by GitHub
parent
commit
ecba16a479
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      updatewine.sh

+ 2
- 2
updatewine.sh View File

@ -263,7 +263,7 @@ The script strongly recommends ~\e[1m$((${REC_SPACE} / 1000)) GB\e[0m at least t
Be aware that the script process may fail because of this, especially while compiling Wine Staging.\n\n\ Be aware that the script process may fail because of this, especially while compiling Wine Staging.\n\n\
Do you really want to continue? [Y/n]" Do you really want to continue? [Y/n]"
local AVAIL_RAM=$(echo $(( $(grep -oP "(?<=^MemFree:).*[0-9]" /proc/meminfo | sed 's/ //g') / 1024 )))
local AVAIL_RAM=$(( $(grep -oP "(?<=^MemFree:).*[0-9]" /proc/meminfo | sed 's/ //g') / 1024 ))
local REC_RAM=4096 local REC_RAM=4096
local MSG_RAM="\e[1mWARNING:\e[0m Not sufficient RAM available\n\nCompilation processes will likely fail.\n\ local MSG_RAM="\e[1mWARNING:\e[0m Not sufficient RAM available\n\nCompilation processes will likely fail.\n\
The script strongly recommends ~\e[1m${REC_RAM} MB\e[0m at least to compile software successfully but you have only\n\ The script strongly recommends ~\e[1m${REC_RAM} MB\e[0m at least to compile software successfully but you have only\n\
@ -285,7 +285,7 @@ Do you really want to continue? [Y/n]"
done done
local req_targetconditions=($(echo ${req_targetconditions[@]} | sed 's/\(.*\) ||/\1 /')) local req_targetconditions=($(echo ${req_targetconditions[@]} | sed 's/\(.*\) ||/\1 /'))
local fullcondition="[[ "${avail_prop}" -lt "${req_prop}" ]] && $(echo ${req_targetconditions[@]})"
local fullcondition="[[ "${avail_prop}" -lt "${req_prop}" ]] && ($(echo ${req_targetconditions[@]}))"
if $(eval ${fullcondition}); then if $(eval ${fullcondition}); then
INFO_SEP INFO_SEP


Loading…
Cancel
Save