소스 검색

Fix if condition to prevent add php fpm packages on apache2+nginx.

Raphael Schneeberger 7 년 전
부모
커밋
8ce248c007
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      install/hst-install-debian.sh
  2. 1 1
      install/hst-install-ubuntu.sh

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

@@ -658,7 +658,7 @@ if [ "$multiphp" = 'yes' ]; then
     done
     done
 fi
 fi
 
 
-if [ "$phpfpm" = 'yes' ] || [ -z "$fpm_added" ]; then
+if [ "$phpfpm" = 'yes' ] || [ "$fpm_added" ]; then
     fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
     fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
          php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
          php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
          php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
          php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip

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

@@ -625,7 +625,7 @@ if [ "$multiphp" = 'yes' ]; then
     done
     done
 fi
 fi
 
 
-if [ "$phpfpm" = 'yes' ] || [ -z "$fpm_added" ]; then
+if [ "$phpfpm" = 'yes' ] || [ "$fpm_added" ]; then
     fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
     fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
          php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
          php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
          php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
          php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip