Repository: karaf Updated Branches: refs/heads/master 2038a4bf0 -> 3a8c9e10f
[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/9f926c84 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9f926c84 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9f926c84 Branch: refs/heads/master Commit: 9f926c84acdc274cf023cb59ba8d9fd76a0ffb16 Parents: 4aad87b Author: Raman Gupta <[email protected]> Authored: Wed Feb 3 02:29:58 2016 -0500 Committer: Raman Gupta <[email protected]> Committed: Wed Feb 3 02:30:13 2016 -0500 ---------------------------------------------------------------------- .../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/9f926c84/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 {
