From b302b5462f17a1891b7580822887e20a8f15062c Mon Sep 17 00:00:00 2001 From: "Ramón M. Gómez" Date: Wed, 11 Mar 2020 15:07:45 +0100 Subject: #959: Update OGAgent version. --- admin/Sources/Clients/ogagent/src/opengnsys/__init__.py | 6 +++--- admin/Sources/Clients/ogagent/src/setup.py | 2 +- installer/ogagent-devel-installer.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/Sources/Clients/ogagent/src/opengnsys/__init__.py b/admin/Sources/Clients/ogagent/src/opengnsys/__init__.py index 02e7c341..0197f320 100644 --- a/admin/Sources/Clients/ogagent/src/opengnsys/__init__.py +++ b/admin/Sources/Clients/ogagent/src/opengnsys/__init__.py @@ -38,10 +38,10 @@ import modules from RESTApi import REST, RESTError try: - with open('VERSION', 'r') as v: - VERSION = v.read() + with open('../VERSION', 'r') as v: + VERSION = v.read().strip() except IOError: - VERSION = '1.1.0' + VERSION = '1.1.1b' __title__ = 'OpenGnsys Agent' __version__ = VERSION diff --git a/admin/Sources/Clients/ogagent/src/setup.py b/admin/Sources/Clients/ogagent/src/setup.py index 15254f4f..85300f7e 100644 --- a/admin/Sources/Clients/ogagent/src/setup.py +++ b/admin/Sources/Clients/ogagent/src/setup.py @@ -63,7 +63,7 @@ import sys # Reading version file: try: with open('VERSION', 'r') as v: - VERSION = v.read() + VERSION = v.read().split() except IOError: VERSION = '1.1.0' diff --git a/installer/ogagent-devel-installer.sh b/installer/ogagent-devel-installer.sh index 201e67f9..d8745c52 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 -- cgit v1.2.3-18-g5258