Skip to content

Commit

Permalink
Merge pull request #33 from i-doit/MichaelOv-patch-1
Browse files Browse the repository at this point in the history
Update idoit-install
  • Loading branch information
MichaelOv authored Jan 9, 2024
2 parents 5ba2d78 + acafd4c commit 97f13cc
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions idoit-install
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ function identifyOS {
if [[ "$NAME" == "CentOS Linux" && "$VERSION_ID" == "7" ]]; then
log "Warning: This OS is not officially supported by i-doit"
log "Warning: CentOS 7 is out-dated. Please consider to upgrade your OS."
askYesNo "Do you really want to continue?" || cancel
askNoYes "Do you really want to continue?" || cancel

OS="centos7"
APACHE_USER="apache"
Expand All @@ -280,7 +280,7 @@ function identifyOS {
PHP_FPM_UNIT="php-fpm"
elif [[ "$NAME" == "CentOS Linux" && "$VERSION_ID" == "8" ]]; then
log "Warning: This OS is not officially supported by i-doit"
askYesNo "Do you really want to continue?" || cancel
askNoYes "Do you really want to continue?" || cancel

OS="centos8"
APACHE_USER="apache"
Expand Down Expand Up @@ -343,7 +343,7 @@ function identifyOS {
PHP_FPM_UNIT="php-fpm"
elif [[ "$NAME" == "Red Hat Enterprise Linux Server" && "$VERSION_ID" == 7* ]]; then
log "Warning: RHEL 7 is out-dated. Please consider to upgrade your OS."
askYesNo "Do you really want to continue?" || cancel
askNoYes "Do you really want to continue?" || cancel

OS="rhel7"
APACHE_USER="apache"
Expand Down Expand Up @@ -452,7 +452,7 @@ function checkHardwareRequirements {
if [[ "$arch" != "x86_64" ]]; then
log "Attention! The system architecture is not x86 64 bit, but ${arch}. This could cause unwanted behaviour."

askYesNo "Do you really want to continue?" || cancel
askNoYes "Do you really want to continue?" || cancel
fi

cores=$(nproc)
Expand All @@ -466,7 +466,7 @@ function checkHardwareRequirements {
log ""
log " <https://kb.i-doit.com/display/en/System+Requirements>"
log ""
askYesNo "Do you really want to continue?" && cancel
askNoYes "Do you really want to continue?" || cancel
fi

ram=$(vmstat --stats --unit b | grep -i "total memory" | awk '{print $1}')
Expand All @@ -480,7 +480,7 @@ function checkHardwareRequirements {
log ""
log " <https://kb.i-doit.com/display/en/System+Requirements>"
log ""
askYesNo "Do you really want to continue?" && cancel
askNoYes "Do you really want to continue?" || cancel
fi
}

Expand Down

0 comments on commit 97f13cc

Please sign in to comment.