#913: Using version file to create and install new OGAgent 1.1.0a agents.

9 files changed, 32 insertions, 16 deletions

diff --git a/admin/Sources/Clients/ogagent/linux/build-packages.sh b/admin/Sources/Clients/ogagent/linux/build-packages.sh
index b4f11077..02b5ee12 100755
--- a/admin/Sources/Clients/ogagent/linux/build-packages.sh
+++ b/admin/Sources/Clients/ogagent/linux/build-packages.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-VERSION=1.1.0
-RELEASE=1
-
 cd $(dirname "$0")
 top=`pwd`
 
+[ -r ../src/VERSION ] && VERSION="$(cat ../src/VERSION)" || VERSION="1.1.0"
+RELEASE="1"
+
 # Debian based
 dpkg-buildpackage -b -d
 
diff --git a/admin/Sources/Clients/ogagent/linux/debian/changelog b/admin/Sources/Clients/ogagent/linux/debian/changelog
index 01fd564d..d58b7611 100644
--- a/admin/Sources/Clients/ogagent/linux/debian/changelog
+++ b/admin/Sources/Clients/ogagent/linux/debian/changelog
@@ -1,8 +1,14 @@
+ogagent (1.1.0a) stable; urgency=medium
+
+  * Fix a bug when activating the agent with some network devices
+
+ -- Ramón M. Gómez <ramongomez@us.es>  Wed, 22 May 2019 18:00:00 +0200
+
 ogagent (1.1.0) stable; urgency=medium
 
   * Functional OpenGnsys Agent interacting with OpenGnsys Server 1.1.0
 
- -- Ramón M. Gómez <ramongomez@us.es>  Tue, 13 Oct 2016 17:00:00 +0200
+ -- Ramón M. Gómez <ramongomez@us.es>  Tue, 13 Oct 2016 17:00:00 +0100
 
 ogagent (1.0.0) stable; urgency=medium
 
diff --git a/admin/Sources/Clients/ogagent/macos/build-pkg.sh b/admin/Sources/Clients/ogagent/macos/build-pkg.sh
index 500da58e..29f5545a 100755
--- a/admin/Sources/Clients/ogagent/macos/build-pkg.sh
+++ b/admin/Sources/Clients/ogagent/macos/build-pkg.sh
@@ -2,11 +2,11 @@
 # Create macOS installation packages.
 # Based on bomutils tutorail: http://bomutils.dyndns.org/tutorial.html
 
-VERSION=1.1.0
+cd $(dirname $0)
+[ -r ../src/VERSION ] && VERSION="$(cat ../src/VERSION)" || VERSION="1.1.0"
 AUTHOR="OpenGnsys Project"
 
 # Create empty directories.
-cd $(dirname $0)
 rm -fr build
 mkdir -p build && cd build
 mkdir -p flat/base.pkg flat/Resources/en.lproj
@@ -57,7 +57,7 @@ mkbom -u 0 -g 80 root flat/base.pkg/Bom
 cat << EOT > flat/Distribution
 <?xml version="1.0" encoding="utf-8"?>
 <installer-script minSpecVersion="1.000000" authoringTool="com.apple.PackageMaker" authoringToolVersion="3.0.3" authoringToolBuild="174">
-    <title>OGAgent 1.1.0</title>
+    <title>OGAgent $VERSION</title>
     <options customize="never" allow-external-scripts="no"/>
     <domains enable_anywhere="true"/>
     <installation-check script="pm_install_check();"/>
diff --git a/admin/Sources/Clients/ogagent/src/VERSION b/admin/Sources/Clients/ogagent/src/VERSION
index 9084fa2f..e96fc8da 100644
--- a/admin/Sources/Clients/ogagent/src/VERSION
+++ b/admin/Sources/Clients/ogagent/src/VERSION
@@ -1 +1 @@
-1.1.0
+1.1.0a
diff --git a/admin/Sources/Clients/ogagent/src/opengnsys/__init__.py b/admin/Sources/Clients/ogagent/src/opengnsys/__init__.py
index 48453fb7..289d4647 100644
--- a/admin/Sources/Clients/ogagent/src/opengnsys/__init__.py
+++ b/admin/Sources/Clients/ogagent/src/opengnsys/__init__.py
@@ -37,7 +37,11 @@ import six
 import modules
 from RESTApi import REST, RESTError
 
-VERSION = '1.1.0'
+try:
+    with open('VERSION', 'r') as v:
+        VERSION = v.read()
+except IOError:
+    VERSION = '1.1.0'
 
 __title__ = 'OpenGnsys Agent'
 __version__ = VERSION
diff --git a/admin/Sources/Clients/ogagent/src/opengnsys/modules/server/OpenGnSys/__init__.py b/admin/Sources/Clients/ogagent/src/opengnsys/modules/server/OpenGnSys/__init__.py
index 721343a9..1c196222 100644
--- a/admin/Sources/Clients/ogagent/src/opengnsys/modules/server/OpenGnSys/__init__.py
+++ b/admin/Sources/Clients/ogagent/src/opengnsys/modules/server/OpenGnSys/__init__.py
@@ -58,7 +58,7 @@ def catchBackgroundError(fnc):
 
 class OpenGnSysWorker(ServerWorker):
     name = 'opengnsys'
-    interface = None  # Binded interface for OpenGnsys
+    interface = None  # Bound interface for OpenGnsys
     loggedin = False  # User session flag
     locked = {}
     random = None     # Random string for secure connections
@@ -79,7 +79,7 @@ class OpenGnSysWorker(ServerWorker):
         '''
         Sends OGAgent activation notification to OpenGnsys server
         '''
-        self.cmd = None
+        t = 0
         # Generate random secret to send on activation
         self.random = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(self.length))
         # Ensure cfg has required configuration variables or an exception will be thrown
@@ -245,7 +245,7 @@ class OpenGnSysWorker(ServerWorker):
         self.checkSecret(server)
         # Sending log off message to OGAgent client.
         self.sendClientMessage('logoff', {})
-        return {'op': 'sended to client'}
+        return {'op': 'sent to client'}
 
     def process_popup(self, path, getParams, postParams, server):
         '''
diff --git a/admin/Sources/Clients/ogagent/src/setup.py b/admin/Sources/Clients/ogagent/src/setup.py
index f80bf33b..bb928706 100644
--- a/admin/Sources/Clients/ogagent/src/setup.py
+++ b/admin/Sources/Clients/ogagent/src/setup.py
@@ -31,8 +31,6 @@
 @author: Ramón M. Gómez, ramongomez at us dot es
 '''
 
-VERSION = '1.1.0'
-
 # ModuleFinder can't handle runtime changes to __path__, but win32com uses them
 try:
     # py2exe 0.6.4 introduced a replacement modulefinder.
@@ -61,6 +59,13 @@ import py2exe
 import sys
 import os
 
+# Reading version file:
+try:
+    with open('VERSION', 'r') as v:
+        VERSION = v.read()
+except IOError:
+    VERSION = '1.1.0'
+
 sys.argv.append('py2exe')
 
 def get_requests_cert_file():
@@ -115,7 +120,7 @@ setup(
         }
     ],
     service=[udsservice],
-    data_files=[('', [get_requests_cert_file()]),('cfg', ['cfg/ogagent.cfg', 'cfg/ogclient.cfg'])],
+    data_files=[('', [get_requests_cert_file()]), ('cfg', ['cfg/ogagent.cfg', 'cfg/ogclient.cfg'])],
     options={
         'py2exe': {
             'bundle_files': 3,
diff --git a/admin/Sources/Clients/ogagent/src/update.sh b/admin/Sources/Clients/ogagent/src/update.sh
index 1019ea85..e6e02ab3 100755
--- a/admin/Sources/Clients/ogagent/src/update.sh
+++ b/admin/Sources/Clients/ogagent/src/update.sh
@@ -33,6 +33,7 @@ function process {
 }    
 
 cd $(dirname "$0")
+[ -r VERSION ] && sed -i "s/Version [^<]*/Version $(cat VERSION)/" about-dialog.ui
 pyrcc4 -py3 OGAgent.qrc -o OGAgent_rc.py
 
 
diff --git a/installer/ogagent-devel-installer.sh b/installer/ogagent-devel-installer.sh
index a07de1d2..a1011595 100755
--- a/installer/ogagent-devel-installer.sh
+++ b/installer/ogagent-devel-installer.sh
@@ -37,7 +37,7 @@ read
 # Importing OGAgent source code.
 svn export --force $SVNURL $PROGDIR || exit 1
 # Downloading Visual C++ Redistributable.
-wget --unlink https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe
+wget --unlink https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe -O $PROGDIR/vcredist_x86.exe
 
 # Update PyQt components.
 pushd ogagent/src >/dev/null