jh_installlibs: Avoid duplicate upstream version in filename

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

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@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");