[Git][java-team/javatools][master] jh_installlibs: Avoid duplicate upstream version in filename

[Niels Thykier]

Niels Thykier pushed to branch master at Debian Java Maintainers / javatools


Commits:
d3fb8a90 by Niels Thykier at 2018-09-18T18:42:29Z
jh_installlibs: Avoid duplicate upstream version in filename

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


2 changed files:

- debian/changelog
- jh_installlibs


Changes:

=====================================
debian/changelog
=====================================
@@ -5,6 +5,8 @@ javatools (0.66) UNRELEASED; urgency=medium
     unintentionally lost in the "shell -> perl" rewrite of
     jh_installibs.
   * jh_exec: Fix missing guard to skip directories that do not exist.
+  * jh_installlibs: Avoid duplicated upstream version in file name
+    like the original version of jh_installlibs did.
 
  -- Niels Thykier <niels at thykier.net>  Tue, 18 Sep 2018 17:24:59 +0000
 


=====================================
jh_installlibs
=====================================
@@ -118,7 +118,8 @@ sub process_jars {
     for my $jar (@jars) {
         my $basename = basename($jar);
 
-        $basename =~ s/[.]jar$//;
+        # Strip trailing -<VERSION>.jar or .jar
+        $basename =~ s/(?:-\Q${UPSTREAM_VERSION}\E)?[.]jar$//;
 
         install_dir("${tmpdir}/usr/share/java");
         install_file($jar, "${tmpdir}/usr/share/java/${basename}-${UPSTREAM_VERSION}.jar");



View it on GitLab: https://salsa.debian.org/java-team/javatools/commit/d3fb8a908d3713cb4f7273554fb5f0f50ff7c4c2

-- 
View it on GitLab: https://salsa.debian.org/java-team/javatools/commit/d3fb8a908d3713cb4f7273554fb5f0f50ff7c4c2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180918/0101ea15/attachment.html>