From 34f410cda69c6886573645b07fa111a895f685fb Mon Sep 17 00:00:00 2001
From: Anton Keks <anton@codeborne.com>
Date: Wed, 12 Mar 2014 22:16:46 +0200
Subject: [PATCH] fixed version retrieval again :-)

---
 src/net/azib/ipscan/config/Version.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/net/azib/ipscan/config/Version.java b/src/net/azib/ipscan/config/Version.java
index b943f7c8..20bf1cea 100755
--- a/src/net/azib/ipscan/config/Version.java
+++ b/src/net/azib/ipscan/config/Version.java
@@ -3,7 +3,6 @@
  */
 package net.azib.ipscan.config;
 
-import java.net.URI;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.logging.Level;
@@ -58,19 +57,18 @@ public class Version {
 	}
 
 	private static void loadVersionFromJar() {
-		String path = Version.class.getProtectionDomain().getCodeSource().getLocation().toString();
-		if (path.startsWith("jar:file:")) {
-			path = path.substring(4, path.indexOf('!'));
-			try {
-				JarFile jarFile = new JarFile(new URI(path).getPath());
+		try {
+			String path = Version.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
+			if (path.endsWith(".jar") || path.endsWith(".exe")) {
+				JarFile jarFile = new JarFile(path);
 				Attributes attrs = jarFile.getManifest().getMainAttributes();
 				version = attrs.getValue("Version");
 				buildDate = attrs.getValue("Build-Date");
 				return;
 			}
-			catch (Exception e) {
-				LoggerFactory.getLogger().log(Level.WARNING, "Cannot obtain version", e);
-			}
+		}
+		catch (Exception e) {
+			LoggerFactory.getLogger().log(Level.WARNING, "Cannot obtain version", e);
 		}
 		version = "current";
 		buildDate = "today";