Merge pull request #993 from veprbl/fix_archiving_prefix

Download button: put files into a directory

Merge pull request #993 from veprbl/fix_archiving_prefix
Download button: put files into a directory
Dmitriy Zaporozhets
2 parents cb6fcb65 87d2a763
Showing 1 changed file with 4 additions and 1 deletions Show diff stats
app/roles/repository.rb
@@ -115,10 +115,13 @@ module Repository
     storage_path = File.join(Rails.root, "tmp", "repositories", self.code)
     file_path = File.join(storage_path, file_name)
  
+    # Put files into a directory before archiving
+    prefix = self.code + "/"
+
     # Create file if not exists
     unless File.exists?(file_path)
       FileUtils.mkdir_p storage_path
-      file = self.repo.archive_to_file(ref, nil,  file_path)
+      file = self.repo.archive_to_file(ref, prefix,  file_path)
     end
  
     file_path
...	...	@@ -115,10 +115,13 @@ module Repository
115	115	storage_path = File.join(Rails.root, "tmp", "repositories", self.code)
116	116	file_path = File.join(storage_path, file_name)
117	117
	118	+ # Put files into a directory before archiving
	119	+ prefix = self.code + "/"
	120	+
118	121	# Create file if not exists
119	122	unless File.exists?(file_path)
120	123	FileUtils.mkdir_p storage_path
121		- file = self.repo.archive_to_file(ref, nil, file_path)
	124	+ file = self.repo.archive_to_file(ref, prefix, file_path)
122	125	end
123	126
124	127	file_path
...	...