Merge pull request #12 from zepgram/fix/php-version

Fix/php version

Author: Benjamin Calef

provision/010-system-packages.sh

@@ -35,6 +35,9 @@ echo "deb https://packages.sury.org/php/ stretch main" | sudo tee /etc/apt/sourc
 # Set required php version
 MAGENTO_PHP_VERSION="7.2";
 if $(dpkg --compare-versions "${PROJECT_VERSION}" "lt" "2.3"); then
+  MAGENTO_PHP_VERSION="7.1";
+fi
+if $(dpkg --compare-versions "${PROJECT_VERSION}" "lt" "2.1"); then
   MAGENTO_PHP_VERSION="7.0";
 fi
 
@@ -47,18 +50,17 @@ apt-get update -y && apt-get install -y \
   php${MAGENTO_PHP_VERSION}-mysql php${MAGENTO_PHP_VERSION}-sqlite3 libapache2-mod-php${MAGENTO_PHP_VERSION} \
   php${MAGENTO_PHP_VERSION}-memcache php${MAGENTO_PHP_VERSION}-redis php${MAGENTO_PHP_VERSION}-opcache \
   python ruby ruby-dev
-if [[ "${MAGENTO_PHP_VERSION}" == "7.0" ]]; then
+if [ "${MAGENTO_PHP_VERSION}" != "7.2" ]; then
   apt-get install -y php${MAGENTO_PHP_VERSION}-mcrypt
 fi
 
-# Set php version
-PHP_VERSION="$(php --version | head -n 1 | cut -d " " -f 2 | cut -c 1,2,3)";
+# Set php version env
 if [[ -z $(grep "PHP_VERSION" "/etc/profile.d/env.sh") ]]; then
 cat <<EOF >> /etc/profile.d/env.sh
-export PHP_VERSION="${PHP_VERSION}"
+export PHP_VERSION="${MAGENTO_PHP_VERSION}"
 EOF
 else
-  sed -i '/export PHP_VERSION*/c\'"export PHP_VERSION=$PHP_VERSION" /etc/profile.d/env.sh
+  sed -i '/export PHP_VERSION*/c\'"export PHP_VERSION=${MAGENTO_PHP_VERSION}" /etc/profile.d/env.sh
 fi
 source /etc/profile.d/env.sh
 

provision/020-system-services.sh

@@ -21,6 +21,7 @@ mysql -u root -ppassword -e "GRANT ALL PRIVILEGES ON * . * TO 'vagrant'@'localho
 mysql -u root -ppassword -e "GRANT ALL PRIVILEGES ON * . * TO 'vagrant'@'%';"
 mysql -u root -ppassword -e "FLUSH PRIVILEGES;"
 
+
 # -----------------------------------------------------------------------------------------------------
 
 
@@ -123,6 +124,7 @@ EOF
 
 # -----------------------------------------------------------------------------------------------------
 
+
 # Apache php configuration
 sed -i 's/;opcache.enable=.*/opcache.enable=1/' /etc/php/"$PHP_VERSION"/apache2/php.ini
 sed -i 's/;opcache.enable_cli=.*/opcache.enable_cli=1/' /etc/php/"$PHP_VERSION"/apache2/php.ini
@@ -163,6 +165,7 @@ systemd-tmpfiles --create /etc/tmpfiles.d/php-cli-opcache.conf
 
 # -----------------------------------------------------------------------------------------------------
 
+
 mkdir -p /var/www/html
 chown -R www-data:www-data /var/www/
 
@@ -208,6 +211,7 @@ cat <<'EOF' > /etc/apache2/sites-available/001-ssl.conf
 </IfModule>
 EOF
 
+# Enable modules
 a2dismod php7.0 php7.1 php7.2
 a2ensite 000-default
 a2ensite 001-ssl

provision/100-magento-pre.sh

@@ -70,6 +70,7 @@ EOF
 
 # Copy credentials to project user
 chown -R vagrant:vagrant /home/vagrant
+mkdir -p /home/"$PROJECT_USER"/.composer /home/"$PROJECT_USER"/.ssh
 cp -r /home/vagrant/.composer/* /home/"$PROJECT_USER"/.composer/
 cp -r /home/vagrant/.ssh/* /home/"$PROJECT_USER"/.ssh/
 chown -R "$PROJECT_USER":"$PROJECT_USER" /home/"$PROJECT_USER"

provision/110-magento-app.sh

@@ -39,7 +39,7 @@ if [ "$PROJECT_SOURCE" == "composer" ]; then
 		magento/module-downloadable-sample-data magento/module-msrp-sample-data \
 		magento/module-configurable-sample-data magento/module-product-links-sample-data \
 		magento/module-wishlist-sample-data magento/module-swatches-sample-data \
-		magento/sample-data-media magento/module-offline-shipping-sample-data --no-update
+		magento/sample-data-media magento/module-offline-shipping-sample-data
 	fi
 else
 	# Install from git