Commit 06aafb73 authored by Vinnie Okada's avatar Vinnie Okada

Call chdir() with a block

parent abbea9a0
...@@ -11,28 +11,27 @@ module Backup ...@@ -11,28 +11,27 @@ module Backup
s[:tar_version] = tar_version s[:tar_version] = tar_version
tar_file = "#{s[:backup_created_at].to_i}_gitlab_backup.tar" tar_file = "#{s[:backup_created_at].to_i}_gitlab_backup.tar"
orig_pwd = Dir.pwd Dir.chdir(Gitlab.config.backup.path) do
Dir.chdir(Gitlab.config.backup.path) File.open("#{Gitlab.config.backup.path}/backup_information.yml",
"w+") do |file|
file << s.to_yaml.gsub(/^---\n/,'')
end
File.open("#{Gitlab.config.backup.path}/backup_information.yml", "w+") do |file| FileUtils.chmod_R(0700, %w{db uploads repositories})
file << s.to_yaml.gsub(/^---\n/,'')
end
FileUtils.chmod_R(0700, %w{db uploads repositories}) # create archive
$progress.print "Creating backup archive: #{tar_file} ... "
orig_umask = File.umask(0077)
if Kernel.system('tar', '-cf', tar_file, *BACKUP_CONTENTS)
$progress.puts "done".green
else
puts "creating archive #{tar_file} failed".red
abort 'Backup failed'
end
File.umask(orig_umask)
# create archive upload(tar_file)
$progress.print "Creating backup archive: #{tar_file} ... "
orig_umask = File.umask(0077)
if Kernel.system('tar', '-cf', tar_file, *BACKUP_CONTENTS)
$progress.puts "done".green
else
puts "creating archive #{tar_file} failed".red
abort 'Backup failed'
end end
File.umask(orig_umask)
upload(tar_file)
Dir.chdir(orig_pwd)
end end
def upload(tar_file) def upload(tar_file)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment