More changes for vox

OpenVoxProject · Jan 16, 2025 · 2a2cabe · 2a2cabe
1 parent 4c3fef8
commit 2a2cabe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject openvox/lein-ezbake "2.6.3-SNAPSHOT"
+(defproject puppetlabs/lein-ezbake "2.6.3-SNAPSHOT-openvox"
   :description "A system for building packages for trapperkeeper-based applications"
   :url "https://github.com/openvoxproject/ezbake"
   :license {:name "Apache License 2.0"

diff --git a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
@@ -332,7 +332,7 @@
 #deb specific options
 elsif options.output_type == 'deb'
   if options.dist != "#{options.operating_system}#{options.os_version}"
-    options.release = "#{options.release}#{options.dist}"
+    options.release = "#{options.release}+#{options.dist}"
   end
 
   if ! options.is_pe

diff --git a/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake b/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake
@@ -82,7 +82,7 @@ namespace :pl do
         stdout, stderr, exitstatus = Pkg::Util::Execution.capture3(%(bash controller.sh debian #{platform} #{staging_path}))
         Pkg::Util::Execution.success?(exitstatus) or raise "Error running packaging: #{stdout}\n#{stderr}"
         puts "#{stdout}\n#{stderr}"
-        FileUtils.cp(Dir.glob("*#{platform}*.deb"), "#{pkg_path}/#{platform_path}")
+        FileUtils.cp(Dir.glob("*.deb"), "#{pkg_path}/#{platform_path}")
       end
       FileUtils.cp_r(pkg_path, nested_output)
       FileUtils.rm_r(staging_path)