IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: add support for 'space' in backup's filename

Browse Source
This commit is contained in:
Régis Hanol 2016-04-04 17:24:02 +02:00
parent 79639e2dec
commit 332a1ea87e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/routes.rb
View File

@ -9,7 +9,7 @@ require_dependency "permalink_constraint"
# and makes Guard not work properly. # and makes Guard not work properly.
USERNAME_ROUTE_FORMAT = /[\w.\-]+/ unless defined? USERNAME_ROUTE_FORMAT USERNAME_ROUTE_FORMAT = /[\w.\-]+/ unless defined? USERNAME_ROUTE_FORMAT
BACKUP_ROUTE_FORMAT = /[\w.\-]+\.(tar\.gz|tgz)/i unless defined? BACKUP_ROUTE_FORMAT BACKUP_ROUTE_FORMAT = /.+\.(tar\.gz|tgz)/i unless defined? BACKUP_ROUTE_FORMAT
Discourse::Application.routes.draw do Discourse::Application.routes.draw do

12
lib/backup_restore/restorer.rb
View File

@ -157,17 +157,17 @@ module BackupRestore
def copy_archive_to_tmp_directory def copy_archive_to_tmp_directory
log "Copying archive to tmp directory..." log "Copying archive to tmp directory..."
source = File.join(Backup.base_directory, @filename) source = File.join(Backup.base_directory, @filename)
`cp #{source} #{@archive_filename}` `cp '#{source}' '#{@archive_filename}'`
end end
def unzip_archive def unzip_archive
log "Unzipping archive..." log "Unzipping archive..."
FileUtils.cd(@tmp_directory) { `gzip --decompress #{@archive_filename}` } FileUtils.cd(@tmp_directory) { `gzip --decompress '#{@archive_filename}'` }
end end
def extract_metadata def extract_metadata
log "Extracting metadata file..." log "Extracting metadata file..."
FileUtils.cd(@tmp_directory) { `tar --extract --file #{@tar_filename} #{BackupRestore::METADATA_FILE}` } FileUtils.cd(@tmp_directory) { `tar --extract --file '#{@tar_filename}' #{BackupRestore::METADATA_FILE}` }
@metadata = Oj.load_file(@meta_filename) @metadata = Oj.load_file(@meta_filename)
end end
@ -182,7 +182,7 @@ module BackupRestore
def extract_dump def extract_dump
log "Extracting dump file..." log "Extracting dump file..."
FileUtils.cd(@tmp_directory) { `tar --extract --file #{@tar_filename} #{BackupRestore::DUMP_FILE}` } FileUtils.cd(@tmp_directory) { `tar --extract --file '#{@tar_filename}' #{BackupRestore::DUMP_FILE}` }
end end
def restore_dump def restore_dump
@ -275,10 +275,10 @@ module BackupRestore
end end
def extract_uploads def extract_uploads
if `tar --list --file #{@tar_filename} | grep 'uploads/'`.present? if `tar --list --file '#{@tar_filename}' | grep 'uploads/'`.present?
log "Extracting uploads..." log "Extracting uploads..."
FileUtils.cd(File.join(Rails.root, "public")) do FileUtils.cd(File.join(Rails.root, "public")) do
`tar --extract --keep-newer-files --file #{@tar_filename} uploads/` `tar --extract --keep-newer-files --file '#{@tar_filename}' uploads/`
end end
end end
end end