added check using mysql_config to discover DB socket

cykod · Aug 9, 2010 · 5e65dec · 5e65dec
1 parent a9316c5
commit 5e65dec
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/script/quick_install.rb b/script/quick_install.rb
@@ -268,10 +268,18 @@ def create_initial_yml_files
     end
 
     print('Creating cms.yml...')
-    @db_socket = File.exists?('/var/lib/mysql/mysql.sock') ? '/var/lib/mysql/mysql.sock' : '/var/run/mysqld/mysqld.sock'
-    @db_socket = File.exists?(@db_socket) ? @db_socket : '/tmp/mysql.sock'
+
+    @db_socket = `mysql_config --socket`.to_s.strip
+
+    if @db_socket.blank?
+      @db_socket = File.exists?('/var/lib/mysql/mysql.sock') ? '/var/lib/mysql/mysql.sock' : '/var/run/mysqld/mysqld.sock'
+      @db_socket = File.exists?(@db_socket) ? @db_socket : '/tmp/mysql.sock'
+    end
+
+
 
     if !File.exists?(@db_socket)
+
       @db_socket = input_value("Mysql Socket","/var/lib/mysql/mysql.sock")
     end
     write_db_yml_file('cms.yml', { 'username' => "#{@db_name_short}_u" ,'password' => @user_password, 'database'  => @db_name, 'host' => @db_host, 'port' => @db_port, 'socket' => @db_socket })