config.sh (fogproject-1.5.8) | : | config.sh (fogproject-1.5.9) | ||
---|---|---|---|---|
skipping to change at line 23 | skipping to change at line 23 | |||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
# GNU General Public License for more details. | # GNU General Public License for more details. | |||
# | # | |||
# You should have received a copy of the GNU General Public License | # You should have received a copy of the GNU General Public License | |||
# along with this program. If not, see <http://www.gnu.org/licenses/>. | # along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
# | # | |||
[[ -z $repo ]] && repo="php" | [[ -z $repo ]] && repo="php" | |||
[[ -z $packageQuery ]] && packageQuery="dpkg -l \$x | grep '^ii'" | [[ -z $packageQuery ]] && packageQuery="dpkg -l \$x | grep '^ii'" | |||
if [[ $linuxReleaseName == +(*[Bb][Ii][Aa][Nn]*) ]]; then | if [[ $linuxReleaseName == +(*[Bb][Ii][Aa][Nn]*) ]]; then | |||
sysvrcconf="sysv-rc-conf" | sysvrcconf="sysv-rc-conf" | |||
if [[ $OSVersion -gt 9 ]]; then | case $OSVersion in | |||
[[ -z $php_ver || ${php_ver%.*} -lt 7 ]] && php_ver="7.3" | 8) | |||
elif [[ $OSVersion -gt 8 ]]; then | php_ver="5" | |||
[[ -z $php_ver || ${php_ver%.*} -lt 7 ]] && php_ver="7.0" | ;; | |||
else | 9) | |||
[[ -z $php_ver ]] && php_ver="5" | php_ver="7.0" | |||
x="*php5*" | ||||
;; | ||||
10) | ||||
php_ver="7.3" | ||||
x="*php5* *php7.0*" | ||||
;; | ||||
esac | ||||
old_php=$(eval $packageQuery 2>/dev/null | awk '{print $2}' | tr '\n' ' ') | ||||
if [[ -n "$old_php" ]]; then | ||||
dots "Removing old PHP version before installing the new one" | ||||
DEBIAN_FRONTEND=noninteractive apt-get purge -yq ${old_php} >/dev/null 2 | ||||
>&1 | ||||
[[ $? -ne 0 ]] && echo "Failed" || echo "Done" | ||||
apt-get clean -yq >/dev/null 2>&1 | ||||
fi | fi | |||
elif [[ $linuxReleaseName == +(*[Uu][Bb][Uu][Nn][Tt][Uu]*|*[Mm][Ii][Nn][Tt]*) ]] ; then | elif [[ $linuxReleaseName == +(*[Uu][Bb][Uu][Nn][Tt][Uu]*|*[Mm][Ii][Nn][Tt]*) ]] ; then | |||
DEBIAN_FRONTEND=noninteractive apt-get purge -yq sysv-rc-conf >/dev/null 2>& 1 | DEBIAN_FRONTEND=noninteractive apt-get purge -yq sysv-rc-conf >/dev/null 2>& 1 | |||
if [[ $linuxReleaseName == +(*[Uu][Bb][Uu][Nn][Tt][Uu]*) ]]; then | case $OSVersion in | |||
case $OSVersion in | 20) | |||
19|20) | php_ver="7.4" | |||
php_ver="7.3" | ;; | |||
[[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm" | 19) | |||
[[ -z $phpldap ]] && phpldap="php${php_ver}-ldap" | php_ver="7.3" | |||
[[ -z $phpcmd ]] && phpcmd="php" | ;; | |||
;; | 18) | |||
18) | php_ver="7.2" | |||
php_ver="7.2" | ;; | |||
[[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm" | *) | |||
[[ -z $phpldap ]] && phpldap="php${php_ver}-ldap" | sysvrcconf="sysv-rc-conf" | |||
[[ -z $phpcmd ]] && phpcmd="php" | php_ver="7.1" | |||
;; | x="*php5* *php-5*" | |||
*) | eval $packageQuery >>$workingdir/error_logs/fog_error_${version}.log | |||
sysvrcconf="sysv-rc-conf" | 2>&1 | |||
php_ver="7.1" | if [[ $? -ne 0 ]]; then | |||
[[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm" | if [[ $autoaccept != yes ]]; then | |||
[[ -z $phpldap ]] && phpldap="php${php_ver}-ldap" | echo " *** Detected a potential need to reinstall apache and | |||
[[ -z $phpcmd ]] && phpcmd="php" | php files." | |||
x="*php5* *php-5*" | echo " *** This will remove the /etc/php* and /etc/apache2* | |||
eval $packageQuery >>$workingdir/error_logs/fog_error_${version} | directories" | |||
.log 2>&1 | echo " *** and remove/purge the apache and php files from t | |||
if [[ $? -ne 0 ]]; then | his system." | |||
if [[ $autoaccept != yes ]]; then | echo " *** If you're okay with this please type Y, anything | |||
echo " *** Detected a potential need to reinstall apache | else will" | |||
and php files." | echo " *** continue the installation, but may mean you will | |||
echo " *** This will remove the /etc/php* and /etc/apach | need to" | |||
e2* directories" | echo " *** remove the files later and make proper changes a | |||
echo " *** and remove/purge the apache and php files fr | s " | |||
om this system." | echo " *** necessary. (Y/N): " | |||
echo " *** If you're okay with this please type Y, anyth | read dummy | |||
ing else will" | else | |||
echo " *** continue the installation, but may mean you | dummy="y" | |||
will need to" | ||||
echo " *** remove the files later and make proper chang | ||||
es as " | ||||
echo " *** necessary. (Y/N): " | ||||
read dummy | ||||
else | ||||
dummy="y" | ||||
fi | ||||
case $dummy in | ||||
[Yy]) | ||||
dots "Removing apache and php files" | ||||
rm -rf /etc/php* /etc/apache2* | ||||
echo "Done" | ||||
dots "Stopping web services" | ||||
if [[ $systemctl == yes ]]; then | ||||
systemctl is-active --quiet apache2 && systemctl | ||||
stop apache2 >/dev/null 2>&1 || true | ||||
fi | ||||
[[ ! $? -eq 0 ]] && echo "Failed" || echo "Done" | ||||
dots "Removing the apache and php packages" | ||||
DEBIAN_FRONTEND=noninteractive apt-get purge -yq 'ap | ||||
ache2*' 'php5*' 'php7*' 'libapache*' >/dev/null 2>&1 | ||||
[[ ! $? -eq 0 ]] && echo "Failed" || echo "Done" | ||||
apt-get clean -yq >/dev/null 2>&1 | ||||
;; | ||||
esac | ||||
fi | fi | |||
esac | case $dummy in | |||
fi | [Yy]) | |||
dots "Removing apache and php files" | ||||
rm -rf /etc/php* /etc/apache2* | ||||
echo "Done" | ||||
dots "Stopping web services" | ||||
if [[ $systemctl == yes ]]; then | ||||
systemctl is-active --quiet apache2 && systemctl sto | ||||
p apache2 >/dev/null 2>&1 || true | ||||
fi | ||||
[[ ! $? -eq 0 ]] && echo "Failed" || echo "Done" | ||||
dots "Removing the apache and php packages" | ||||
DEBIAN_FRONTEND=noninteractive apt-get purge -yq 'apache | ||||
2*' 'php5*' 'php7*' 'libapache*' >/dev/null 2>&1 | ||||
[[ ! $? -eq 0 ]] && echo "Failed" || echo "Done" | ||||
apt-get clean -yq >/dev/null 2>&1 | ||||
;; | ||||
esac | ||||
fi | ||||
esac | ||||
else | else | |||
[[ -z $php_ver ]] && php_ver=5 | [[ -z $php_ver ]] && php_ver=5 | |||
fi | fi | |||
[[ -z $php_verAdds ]] && php_verAdds="-${php_ver}" | [[ -z $php_verAdds ]] && php_verAdds="-${php_ver}" | |||
[[ $php_ver == 5 ]] && php_verAdds="-5.6" | [[ $php_ver == 5 ]] && php_verAdds="-5.6" | |||
[[ $php_ver != 5 ]] && phpcmd="php" || phpcmd="php5" | [[ $php_ver != 5 ]] && phpcmd="php" || phpcmd="php5" | |||
[[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm" | [[ -z $phpfpm ]] && phpfpm="php${php_ver}-fpm" | |||
[[ -z $phpldap ]] && phpldap="php${php_ver}-ldap" | [[ -z $phpldap ]] && phpldap="php${php_ver}-ldap" | |||
[[ -z $phpcmd ]] && phpcmd="php" | [[ -z $phpcmd ]] && phpcmd="php" | |||
case $linuxReleaseName in | case $linuxReleaseName in | |||
End of changes. 3 change blocks. | ||||
68 lines changed or deleted | 74 lines changed or added |