author | Shawn Ferry <shawn.ferry@oracle.com> |
Mon, 28 Nov 2016 16:54:02 -0800 | |
changeset 7565 | 48aa82a0931f |
permissions | -rw-r--r-- |
7565
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
1 |
Merged with upstream PUP 4.9.0 |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
2 |
(PUP-6795) Solaris does not support gzipped man pages |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
3 |
https://tickets.puppetlabs.com/browse/PUP-6795 |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
4 |
|
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
5 |
--- a/install.rb |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
6 |
+++ b/install.rb |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
7 |
@@ -108,9 +108,12 @@ def do_man(man, strip = 'man/') |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
8 |
FileUtils.makedirs(om, {:mode => 0755, :verbose => true}) |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
9 |
FileUtils.chmod(0755, om) |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
10 |
FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true}) |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
11 |
- gzip = %x{which gzip} |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
12 |
- gzip.chomp! |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
13 |
- %x{#{gzip} -f #{omf}} |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
14 |
+ # Solaris does not support gzipped man pages |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
15 |
+ unless Facter["os"].value["family"] == "Solaris" |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
16 |
+ gzip = %x{which gzip} |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
17 |
+ gzip.chomp! |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
18 |
+ %x{#{gzip} -f #{omf}} |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
19 |
+ end |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
20 |
end |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
21 |
end |