From bf7c3bcd9145285edb0d4109cf8dbf597a02731e Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Fri, 10 May 2019 12:13:25 +0100
Subject: [PATCH] Fixed nuspec version builder

---
 app/make-nupkg.sh | 20 ++++++++++++++------
 package.json      |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/make-nupkg.sh b/app/make-nupkg.sh
index fda63832..bbd9be4f 100644
--- a/app/make-nupkg.sh
+++ b/app/make-nupkg.sh
@@ -21,13 +21,21 @@ packageVersion=$(cat $packageJson \
   | sed 's/[",]//g' \
   | tr -d '[[:space:]]')
 
-# Convert into a nupkg-safe version string
-majVer="$(echo $packageVersion | cut -d'-' -f1)"
-minVer="$(echo $packageVersion | cut -d'-' -f2)"
-minVer="${minVer//.}"
-version="$majVer-$minVer"
+echo "$packageVersion"
 
-echo $version
+# Convert into a nupkg-safe version string
+majVer="$(echo "$packageVersion" | cut -d'-' -f1)"
+minVer="$(echo "$packageVersion" | cut -d'-' -f2)"
+
+if [ "$majVer" = "$minVer" ]; then
+  version="$majVer"
+else
+  minVer="${minVer//.}"
+  version="$majVer-$minVer"  
+fi
+
+
+echo "$version"
 
 # Build installer URL
 instURL="$CI_JOB_URL/artifacts/raw/release-builds/openflexure-ev-win.exe"
diff --git a/package.json b/package.json
index 64e7d98d..d5270293 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openflexure-ev",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "private": true,
   "description": "An electron-based user client for the OpenFlexure Microscope Server",
   "author": "OpenFlexure <contact@openflexure.org> (https://www.openflexure.org)",