Просмотр исходного кода

Revert apt fix issue and modify php sed to prevent wrong replace.

Raphael Schneeberger 7 лет назад
Родитель
Сommit
4f4ddeb4d4
2 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      install/hst-install-debian.sh
  2. 2 2
      install/hst-install-ubuntu.sh

+ 2 - 2
install/hst-install-debian.sh

@@ -707,7 +707,7 @@ if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
     software=$(echo "$software" | sed -e 's/fail2ban//')
     software=$(echo "$software" | sed -e 's/fail2ban//')
 fi
 fi
 if [ "$phpfpm" = 'yes' ]; then
 if [ "$phpfpm" = 'yes' ]; then
-    software=$(echo "$software" | sed -e 's/php//')
+    software=$(echo "$software" | sed -e 's/ php //')
     software=$(echo "$software" | sed -e 's/php-pgsql//')
     software=$(echo "$software" | sed -e 's/php-pgsql//')
     software=$(echo "$software" | sed -e 's/php-curl//')
     software=$(echo "$software" | sed -e 's/php-curl//')
     software=$(echo "$software" | sed -e 's/php-common//')
     software=$(echo "$software" | sed -e 's/php-common//')
@@ -729,7 +729,7 @@ chmod a+x /usr/sbin/policy-rc.d
 
 
 # Installing apt packages
 # Installing apt packages
 echo -ne "Install HestiaCP and all required packages, the process will take around 10-15 minutes... "
 echo -ne "Install HestiaCP and all required packages, the process will take around 10-15 minutes... "
-apt-get -y --allow-change-held-packages install $software > /dev/null 2>&1 &
+apt-get -y install $software > /dev/null 2>&1 &
 BACK_PID=$!
 BACK_PID=$!
 
 
 # Check if package installation is done, print a spinner
 # Check if package installation is done, print a spinner

+ 2 - 2
install/hst-install-ubuntu.sh

@@ -682,7 +682,7 @@ if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
     software=$(echo "$software" | sed -e 's/fail2ban//')
     software=$(echo "$software" | sed -e 's/fail2ban//')
 fi
 fi
 if [ "$phpfpm" = 'yes' ]; then
 if [ "$phpfpm" = 'yes' ]; then
-    software=$(echo "$software" | sed -e 's/php//')
+    software=$(echo "$software" | sed -e 's/ php //')
     software=$(echo "$software" | sed -e 's/php-pgsql//')
     software=$(echo "$software" | sed -e 's/php-pgsql//')
     software=$(echo "$software" | sed -e 's/php-curl//')
     software=$(echo "$software" | sed -e 's/php-curl//')
     software=$(echo "$software" | sed -e 's/php-common//')
     software=$(echo "$software" | sed -e 's/php-common//')
@@ -704,7 +704,7 @@ chmod a+x /usr/sbin/policy-rc.d
 
 
 # Installing apt packages
 # Installing apt packages
 echo -ne "Install HestiaCP and all required packages, the process will take around 10-15 minutes... "
 echo -ne "Install HestiaCP and all required packages, the process will take around 10-15 minutes... "
-apt-get -y --allow-change-held-packages install $software > /dev/null 2>&1 &
+apt-get -y install $software > /dev/null 2>&1 &
 BACK_PID=$!
 BACK_PID=$!
 
 
 # Check if package installation is done, print a spinner
 # Check if package installation is done, print a spinner