1.0.11 Refactor/Updates

 - 000-setup_environment.sh updated grep command to use a count comparison when checking if aliases exist in .bash_aliases
 - 000-setup_environment.sh replaced 'freetype*' with specific 'libfreetype6-dev' in php pre-requisites
 - 400-setup_mysql.sh added if condition to avoid overwrite existing mysql data with that of a fresh install
 - 500-setup_php.sh moved sed replace commands into seperate condition to handle old php-farm pulls

Author: Michael Kreitzer

scripts/000-setup_environment.sh

@@ -40,14 +40,14 @@ rm -f /etc/profile.d/00-aliases.sh
 cp /vagrant/files/profile.d/* /etc/profile.d/
 
 # Next line needed so that root will have access to these aliases
-if [ ! -f /root/.bash_aliases ] || ! grep -q "for f in \/etc\/profile.d\/\*-aliases.sh; do source \$f; done" /root/.bash_aliases ; then
+if [ ! -f /root/.bash_aliases ] || [ $(grep -c "for f in /etc/profile.d/\*aliases.sh; do source \$f; done" /root/.bash_aliases) -eq 0 ] ; then
     echo 'for f in /etc/profile.d/*-aliases.sh; do source $f; done' >> /root/.bash_aliases
 fi
 
 #Setup PHP compile pre-requisites
 apt-get install -y  build-essential libbz2-dev libmysqlclient-dev libxpm-dev libmcrypt-dev \
     libcurl4-gnutls-dev libxml2-dev libjpeg-dev libpng12-dev libssl-dev pkg-config libreadline-dev \
-    curl autoconf libicu-dev libxslt-dev freetype* 2>&1
+    curl autoconf libicu-dev libxslt-dev libfreetype6-dev 2>&1
 
 # Workaround to allow custom scripts added to path with sudo
 if ! grep -q "^#Defaults[[:blank:]]*secure_path" /etc/sudoers ; then

scripts/400-setup_mysql.sh

@@ -41,8 +41,12 @@ if [ ! -f /etc/init.d/mysql* ]; then
     sed -i "s/bind-address.*/bind-address    = 0.0.0.0/"           /etc/mysql/my.cnf
     sed -i "s/max_allowed_packet.*/max_allowed_packet      = 64M/" /etc/mysql/my.cnf
     sed -i "s/datadir.*/datadir         = \/srv\/mysql\/data/"     /etc/mysql/my.cnf
-    echo "Copying mysql databases from /var/lib/mysql/ to /srv/mysql/data ..."
-    cp -r /var/lib/mysql/* /srv/mysql/data
+    if [ ! -d /srv/mysql/data/mysql ]; then
+        echo "Copying mysql databases from /var/lib/mysql/ to /srv/mysql/data ..."
+        cp -r /var/lib/mysql/* /srv/mysql/data
+    else
+        echo "Not moving mysql databases from /var/lib/mysql/ to /srv/mysql/data since data is already present there"
+    fi
 
     service mysql start
 

scripts/500-setup_php.sh

@@ -41,8 +41,8 @@ function setup_phpfarm() {
     cd /opt
     if [ ! -d /opt/phpfarm ]; then
         git clone https://github.com/DemacMedia/phpfarm.git phpfarm
-
-        # Patch phpfarm options files until I can get a PR put on there to fix these at source:
+    else
+        # Patch old phpfarm options:
         if [[ $(/opt/phpfarm/custom/options-5.4.sh | grep 'freetype')  == '' ]]; then
             sed -i "s/--with-png-dir/--with-png-dir \\\\\n--with-freetype-dir=\/usr\/include\/freetype2 \\\\\n--enable-gd-native-ttf/" /opt/phpfarm/custom/options-5.4.sh
         fi