Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 6af688ebe -> 8b73927c6
[KARAF-4307] tooling: check for usePathPrefix for bin mode Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8b73927c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8b73927c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8b73927c Branch: refs/heads/karaf-4.0.x Commit: 8b73927c6a74d9a08fba64f36a598900844d9dc1 Parents: 6af688e Author: Raman Gupta <[email protected]> Authored: Wed Feb 3 02:29:58 2016 -0500 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Feb 17 16:03:56 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/karaf/tooling/ArchiveMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/8b73927c/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java index e5dcbcb..c8362ac 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java @@ -197,7 +197,7 @@ public class ArchiveMojo extends MojoSupport { String entryName = base + f.getFileName().toString(); TarArchiveEntry tarEntry = new TarArchiveEntry(entryName); tarEntry.setSize(Files.size(f)); - if (entryName.contains("/bin/")) { + if (entryName.contains("/bin/") || (!usePathPrefix && entryName.startsWith("bin/"))) { if (entryName.endsWith(".bat")) { tarEntry.setMode(0644); } else { @@ -232,7 +232,7 @@ public class ArchiveMojo extends MojoSupport { String entryName = base + f.getFileName().toString(); ZipArchiveEntry zipEntry = new ZipArchiveEntry(entryName); zipEntry.setSize(Files.size(f)); - if (entryName.contains("/bin/")) { + if (entryName.contains("/bin/") || (!usePathPrefix && entryName.startsWith("bin"))) { if (!entryName.endsWith(".bat")) { zipEntry.setUnixMode(0755); } else {
