diff --git a/installer/debian/oco-agent/DEBIAN/control b/installer/debian/oco-agent/DEBIAN/control index ebae84e..c9884b7 100644 --- a/installer/debian/oco-agent/DEBIAN/control +++ b/installer/debian/oco-agent/DEBIAN/control @@ -1,5 +1,5 @@ Package: OCO-Agent -Version: 1.0.3 +Version: 1.0.4 Section: base Priority: optional Architecture: all diff --git a/installer/macos/build.sh b/installer/macos/build.sh index cc2a1b8..70905f2 100755 --- a/installer/macos/build.sh +++ b/installer/macos/build.sh @@ -5,7 +5,7 @@ set -e SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" TARGET_DIRECTORY="$SCRIPTPATH/target" PRODUCT="OCO Agent" -VERSION="1.0.3" +VERSION="1.0.4" TARGET_FILENAME="oco-agent.pkg" DEVELOPER_ID_INSTALLER_CERT_NAME="Developer ID Installer: Georg Sieber (96G8V7UY3M)" #DEVELOPER_ACCOUNT_USERNAME="" diff --git a/installer/windows/oco-agent.iss b/installer/windows/oco-agent.iss index 55043ff..21d245c 100644 --- a/installer/windows/oco-agent.iss +++ b/installer/windows/oco-agent.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "OCO Agent" -#define MyAppVersion "1.0.3" +#define MyAppVersion "1.0.4" #define MyAppPublisher "Sieber Systems" #define MyAppURL "https://github.com/schorschii/OCO-Agent" #define MyAppSupportURL "https://sieber.systems/" diff --git a/oco_agent/__init__.py b/oco_agent/__init__.py index b5dcf65..7cdc3ce 100644 --- a/oco_agent/__init__.py +++ b/oco_agent/__init__.py @@ -1,7 +1,7 @@ __title__ = 'OCO-Agent' __author__ = 'Georg Sieber' __license__ = 'GPL-3.0' -__version__ = '1.0.3' +__version__ = '1.0.4' __website__ = 'https://github.com/schorschii/OCO-Agent' __all__ = [__author__, __license__, __version__] diff --git a/oco_agent/oco_agent.py b/oco_agent/oco_agent.py index 5020428..f8cc7a3 100644 --- a/oco_agent/oco_agent.py +++ b/oco_agent/oco_agent.py @@ -13,7 +13,8 @@ try: import pip_system_certs.wrapt_requests -except ImportError: pass +except ImportError: + print('ATTENTION: unable to load pip_system_certs.wrapt_requests') import signal import threading @@ -43,7 +44,7 @@ ##### CONSTANTS ##### -AGENT_VERSION = '1.0.3' +from .__init__ import __version__ EXECUTABLE_PATH = os.path.abspath(os.path.dirname(sys.argv[0])) DEFAULT_CONFIG_PATH = EXECUTABLE_PATH+'/oco-agent.ini' LOCKFILE_PATH = tempfile.gettempdir()+'/oco-agent.lock' @@ -961,7 +962,7 @@ def mainloop(args): # send initial request print(logtime()+'Sending agent_hello...') request = jsonRequest('oco.agent.hello', { - 'agent_version': AGENT_VERSION, + 'agent_version': __version__, 'networks': getNics(), 'services': getServiceStatus(), 'uptime': getUptime() @@ -1000,7 +1001,7 @@ def mainloop(args): print(logtime()+'Updating inventory data...') jsonRequest('oco.agent.update', { 'hostname': getHostname(), - 'agent_version': AGENT_VERSION, + 'agent_version': __version__, 'os': getOs(), 'os_version': getOsVersion(), 'os_license': getIsActivated(),