From 2617b6d50fe3d523d10b44bfc496c6abf2a9dba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C3=B3n=20M=2E=20G=C3=B3mez?= <ramongomez@us.es>
Date: Wed, 5 Jun 2019 10:30:39 +0200
Subject: [PATCH] #913: Adapting commit {{{0fcdc63}}} from master branch.

---
 windows/build-windows.sh | 6 ++++--
 windows/ogagent.nsi      | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/windows/build-windows.sh b/windows/build-windows.sh
index d7248ab..88a3c4e 100755
--- a/windows/build-windows.sh
+++ b/windows/build-windows.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
+cd "$(dirname "$0")"
 export WINEARCH=win32
-export WINEPREFIX=$(realpath $(dirname $0)/wine)
+export WINEPREFIX=$PWD/wine
+grep -o "[0-9]*\.[0-9]*\.[0-9]*" ../src/VERSION > VERSION
 wine cmd /c c:\\ogagent\\build.bat
-chmod -x $(dirname $0)/../OGAgentSetup*.exe
+chmod -x ../OGAgentSetup*.exe
diff --git a/windows/ogagent.nsi b/windows/ogagent.nsi
index 88c9ab2..8caf673 100644
--- a/windows/ogagent.nsi
+++ b/windows/ogagent.nsi
@@ -2,12 +2,17 @@
 # Copy inside the two x86_xxxxx folders inside nsis plugins folder
 Name "OpenGnsys Agent"
 
-# OpenGnsys Actor version
+# OpenGnsys Agent version
 !define /file OGA_VERSION "src\VERSION"
+!define /file OGA_WINVERSION "windows\VERSION"
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\OGAgent"
-!define VERSION ${OGA_VERSION}.0
+!if ${OGA_VERSION} == ${OGA_WINVERSION}
+  !define VERSION ${OGA_WINVERSION}.0
+!else
+  !define VERSION ${OGA_WINVERSION}.1
+!endif
 !define COMPANY "OpenGnsys Project"
 !define URL https://opengnsys.es