diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-06-07 15:11:49 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-06-07 15:11:49 +0000 |
commit | a01c815db28c888e2f5246c05f4da349d6dfc4f3 (patch) | |
tree | a11de74081344631abcfcba06731b003b2822759 /lib | |
parent | cc28c119807a7ac4ccaec74ba3a7d8a9a3f8870f (diff) | |
parent | 6dfb0b4b3194519b5000bfba3e736f48d58d5255 (diff) | |
download | gitlab-ce-a01c815db28c888e2f5246c05f4da349d6dfc4f3.tar.gz |
Merge branch 'backup-rake-tar' into 'master'
Consistently use tar lookup function
See merge request gitlab-org/gitlab-ce!19477
Diffstat (limited to 'lib')
-rw-r--r-- | lib/backup/files.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/backup/files.rb b/lib/backup/files.rb index d769a3ee7b0..e287aa1e392 100644 --- a/lib/backup/files.rb +++ b/lib/backup/files.rb @@ -29,10 +29,10 @@ module Backup raise Backup::Error, 'Backup failed' end - run_pipeline!([%W(tar --exclude=lost+found -C #{@backup_files_dir} -cf - .), %w(gzip -c -1)], out: [backup_tarball, 'w', 0600]) + run_pipeline!([%W(#{tar} --exclude=lost+found -C #{@backup_files_dir} -cf - .), %w(gzip -c -1)], out: [backup_tarball, 'w', 0600]) FileUtils.rm_rf(@backup_files_dir) else - run_pipeline!([%W(tar --exclude=lost+found -C #{app_files_dir} -cf - .), %w(gzip -c -1)], out: [backup_tarball, 'w', 0600]) + run_pipeline!([%W(#{tar} --exclude=lost+found -C #{app_files_dir} -cf - .), %w(gzip -c -1)], out: [backup_tarball, 'w', 0600]) end end @@ -43,7 +43,12 @@ module Backup end def tar - system(*%w[gtar --version], out: '/dev/null') ? 'gtar' : 'tar' + if system(*%w[gtar --version], out: '/dev/null') + # It looks like we can get GNU tar by running 'gtar' + 'gtar' + else + 'tar' + end end def backup_existing_files_dir |