vanagon 0.5.5 → 0.5.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/vanagon/platform/deb.rb +2 -1
- data/resources/osx/postinstall.erb +3 -3
- data/resources/osx/preinstall.erb +1 -1
- data/resources/windows/wix/project.wxs.erb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2788b73738b58776aa0bafc6d4739fc90be798bc
|
|
4
|
+
data.tar.gz: 3613f68d912a5825df9466d7f2434c6862aa46f3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bce0bcaed54e907d75df0d746f5865680ce0533e87b1f028506cab511ca2735c2743a89f16f51e8ace3e0e09964aa8936e4337b0e0f84f0fb13a573b5a960425
|
|
7
|
+
data.tar.gz: a76b088fd7c56a0bced77dfb5189059b68a3b6a144e806071a4116e0a6725666c1fd1a101b6b27f95e6d05e12a4e5f84ebf5c947a132734c8a680828fff2112f
|
data/lib/vanagon/platform/deb.rb
CHANGED
|
@@ -7,6 +7,7 @@ class Vanagon
|
|
|
7
7
|
# @return [Array] list of commands required to build a debian package for the given project from a tarball
|
|
8
8
|
def generate_package(project)
|
|
9
9
|
target_dir = project.repo ? output_dir(project.repo) : output_dir
|
|
10
|
+
pkg_arch_opt = project.noarch ? "" : "-a#{@architecture}"
|
|
10
11
|
["mkdir -p output/#{target_dir}",
|
|
11
12
|
"mkdir -p $(tempdir)/#{project.name}-#{project.version}",
|
|
12
13
|
"cp #{project.name}-#{project.version}.tar.gz $(tempdir)/#{project.name}_#{project.version}.orig.tar.gz",
|
|
@@ -14,7 +15,7 @@ class Vanagon
|
|
|
14
15
|
"cp -pr debian $(tempdir)/#{project.name}-#{project.version}",
|
|
15
16
|
"gunzip -c #{project.name}-#{project.version}.tar.gz | '#{@tar}' -C '$(tempdir)/#{project.name}-#{project.version}' --strip-components 1 -xf -",
|
|
16
17
|
"sed -i 's/\ /?/g' $(tempdir)/#{project.name}-#{project.version}/debian/install",
|
|
17
|
-
"(cd $(tempdir)/#{project.name}-#{project.version}; debuild --no-lintian -uc -us)",
|
|
18
|
+
"(cd $(tempdir)/#{project.name}-#{project.version}; debuild --no-lintian #{pkg_arch_opt} -uc -us)",
|
|
18
19
|
"cp $(tempdir)/*.deb ./output/#{target_dir}"]
|
|
19
20
|
end
|
|
20
21
|
|
|
@@ -11,9 +11,9 @@ else
|
|
|
11
11
|
fi
|
|
12
12
|
<%- end -%>
|
|
13
13
|
|
|
14
|
-
if [ -d "/tmp/.<%= @name %>.upgrade" ]
|
|
14
|
+
if [ -d "/tmp/.<%= @name %>.upgrade" ]; then
|
|
15
15
|
<%- get_services.each do |service| -%>
|
|
16
|
-
if [ -f "/tmp/.<%= @name %>.upgrade/<%= service.name %>" ]
|
|
16
|
+
if [ -f "/tmp/.<%= @name %>.upgrade/<%= service.name %>" ]; then
|
|
17
17
|
/bin/launchctl load -F "<%= service.service_file %>"
|
|
18
18
|
fi
|
|
19
19
|
<%- end -%>
|
|
@@ -22,6 +22,6 @@ fi
|
|
|
22
22
|
<%= File.read("resources/osx/postinstall-extras") if File.exist?("resources/osx/postinstall-extras") %>
|
|
23
23
|
|
|
24
24
|
# Cleanup after ourselves
|
|
25
|
-
if [ -e "/tmp/.<%= @name %>.upgrade" ]
|
|
25
|
+
if [ -e "/tmp/.<%= @name %>.upgrade" ]; then
|
|
26
26
|
rm -rf "/tmp/.<%= @name %>.upgrade"
|
|
27
27
|
fi
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vanagon
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.5.
|
|
4
|
+
version: 0.5.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppet Labs
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-03-
|
|
11
|
+
date: 2016-03-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rspec
|