1.0.2: Updates to issues found when running against an existing instance

 - Added better OS detection to Vagrantfile
 - fixed error in scripts/000-setup_environment.sh to run dos2unix on config_users.sh
 - updated scripts/001-setup_users.sh to run user/group checks without /srv/www

Author: Michael Kreitzer

Vagrantfile

@@ -33,7 +33,25 @@ mounts_required.each do |required_folder|
   end
 end
 
-if !Vagrant::Util::Platform.windows?
+module OS
+    def OS.windows?
+        (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+    end
+
+    def OS.mac?
+        (/darwin/ =~ RUBY_PLATFORM) != nil
+    end
+
+    def OS.unix?
+        !OS.windows?
+    end
+
+    def OS.linux?
+        OS.unix? and not OS.mac?
+    end
+end
+
+if OS.mac?
    check_plugins ["vagrant-bindfs"]
 end
 

scripts/000-setup_environment.sh

@@ -22,7 +22,7 @@ apt-get install -y git tig htop smem strace lynx dos2unix 2>&1
 find /vagrant/files -type f -exec dos2unix {} \;
 dos2unix /vagrant/config_php.sh
 dos2unix /vagrant/config_groups.sh
-dos2unix /vagrant/config_groups.sh
+dos2unix /vagrant/config_users.sh
 
 
 # Setup Hosts file

scripts/001-setup_users.sh

@@ -33,7 +33,7 @@ function vagrant_groups() {
            echo "Remapping existing group ${group_name} from GID ${group_oldGID} to GID ${group_newGID}"
            groupmod -g ${group_newGID} ${group_name}
            echo "Reassigning files and folders associated with old group id to the new one"
-           $(find / -gid ${group_oldGID} '!' -type l -exec chgrp ${group_newGID} '{}' ';' 2>&1 | grep -v 'No such file or directory') || true
+           $(find / -path "/srv/www" -prune -o -gid ${group_oldGID} '!' -type l -exec chgrp ${group_newGID} '{}' ';' 2>&1 | grep -v 'No such file or directory') || true
         fi
     done
 }
@@ -81,7 +81,7 @@ function vagrant_users() {
            echo "Remapping existing user ${user_name} from UID ${user_oldUID} to UID ${user_newUID}"
            usermod -u ${user_newUID} ${user_name}
            echo "Reassigning files and folders associated with old user id to the new one"
-           $(find / -uid ${user_oldUID} '!' -type l -exec chown ${user_newUID} '{}' ';' 2>&1 | grep -v 'No such file or directory') || true
+           $(find / -path "/srv/www" -prune -o -uid ${user_oldUID} '!' -type l -exec chown ${user_newUID} '{}' ';' 2>&1 | grep -v 'No such file or directory') || true
         fi
 
         if [ $(id -g ${user_name}) != ${user_newGID} ]; then
@@ -97,7 +97,7 @@ function vagrant_services {
     local i
     local services
 
-    services=('apache2 mysql redis-server varnish')
+    services=('apache2 redis-server varnish')
     arr=(${services// / })
     for i in "${arr[@]}"; do
         sudo service ${i} ${1} || true