use Dir.tmpdir to simplify changes
This commit is contained in:
parent
b9bef8bbdd
commit
f7ce4c9879
|
@ -61,21 +61,11 @@ module MsfdbHelpers
|
|||
end
|
||||
|
||||
def run_psql(cmd, db_name: 'postgres')
|
||||
socket_directory_regex = "#unix_socket_directories = '\/run\/postgresql'"
|
||||
if @options[:debug]
|
||||
if File.read("#{@db}/postgresql.conf").include?(socket_directory_regex)
|
||||
puts "psql -h \'#{@options[:unix_socket_directories]}\' -p #{@options[:db_port]} -c \"#{cmd};\" #{db_name}"
|
||||
else
|
||||
puts "psql -p #{@options[:db_port]} -c \"#{cmd};\" #{db_name}"
|
||||
end
|
||||
end
|
||||
|
||||
if File.read("#{@db}/postgresql.conf").include?(socket_directory_regex)
|
||||
run_cmd("psql -h \'#{@options[:unix_socket_directories]}\' -p #{@options[:db_port]} -c \"#{cmd};\" #{db_name}")
|
||||
else
|
||||
run_cmd("psql -p #{@options[:db_port]} -c \"#{cmd};\" #{db_name}")
|
||||
puts "psql -h #{Dir.tmpdir} -p #{@options[:db_port]} -c \"#{cmd};\" #{db_name}"
|
||||
end
|
||||
|
||||
run_cmd("psql -h #{Dir.tmpdir} -p #{@options[:db_port]} -c \"#{cmd};\" #{db_name}")
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
|
|
@ -15,17 +15,10 @@ module MsfdbHelpers
|
|||
puts "Creating database at #{@db}"
|
||||
Dir.mkdir(@db)
|
||||
run_cmd("initdb --auth-host=trust --auth-local=trust -E UTF8 #{@db.shellescape}")
|
||||
|
||||
socket_directory_regex = "#unix_socket_directories = '\/run\/postgresql'"
|
||||
if File.read("#{@db}/postgresql.conf").include?(socket_directory_regex)
|
||||
File.open("#{@db}/postgresql.conf", 'a') do |f|
|
||||
f.puts "port = #{@options[:db_port]}"
|
||||
f.puts "unix_socket_directories = \'#{@options[:unix_socket_directories]}\'"
|
||||
end
|
||||
else
|
||||
File.open("#{@db}/postgresql.conf", 'a') do |f|
|
||||
f.puts "port = #{@options[:db_port]}"
|
||||
end
|
||||
|
||||
File.open("#{@db}/postgresql.conf", 'a') do |f|
|
||||
f.puts "port = #{@options[:db_port]}"
|
||||
f.puts "unix_socket_directories = \'#{Dir.tmpdir}\'"
|
||||
end
|
||||
|
||||
start
|
||||
|
|
Loading…
Reference in New Issue