Merge pull request #406 from oneclick/7z

Use 7zip MINGW package instead of MSYS
oneclick · Jan 16, 2025 · 16aa941 · 16aa941
2 parents 1b93823 + 67060bf
commit 16aa941
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/recipes/archive-7z/70-create-archive.rake b/recipes/archive-7z/70-create-archive.rake
@@ -1,10 +1,10 @@
 file archivefile => sandbox_task.sandboxfiles do
   rm_f archivefile
   msys_sh <<-EOT
-    pacman -S --needed --noconfirm p7zip
+    pacman -S --needed --noconfirm $MINGW_PACKAGE_PREFIX-7zip
   EOT
 
   chdir "recipes/sandbox" do
-    sh "sh 7z a -bd ../../#{archivefile} #{sandboxdir.sub("recipes/sandbox/", "")} | ruby -ne \"STDERR.print '.'\""
+    sh "7z a -bd -snl ../../#{archivefile} #{sandboxdir.sub("recipes/sandbox/", "")} | ruby -ne \"STDERR.print '.'\""
   end
 end