diff --git a/setup.py b/setup.py index 256db58..6da9583 100644 --- a/setup.py +++ b/setup.py @@ -1,26 +1,27 @@ # -*- coding: utf-8 -*- from setuphelpers import * +import json uninstallkey = [] key='FusionInventory-Agent' def install(): - print('Opening variable file') - variables = json.loads(open(makepath(programfiles32,'wapt','variables.json'),'r').read()) - if not 'fusinv_server' in variables: - error('Missing fusinv_server variable') - parameters = '/S /acceptlicense /server="%s" /execmode=service /runnow' % (variables['fusinv_server']) - if 'fusinv_user' in variables and 'fusinv_pass' in variables: - parameters = parameters + ' /user="%s" /password="%s"' % (variables['fusinv_user'],variables['fusinv_pass']) - - - print('installing Fusion inventory agent') - versionpaquet = control['version'].split('-',1)[0] - if iswin64(): - install_exe_if_needed("fusioninventory-agent_windows-x64_%s.exe" % versionpaquet,parameters,key=key,min_version=versionpaquet) - else: - install_exe_if_needed("fusioninventory-agent_windows-x86_%s.exe" % versionpaquet,parameters,key=key,min_version=versionpaquet) + print('Opening variable file') + variables = json.loads(open(makepath(programfiles32,'wapt','variables.json'),'r').read()) + if not 'fusinv_server' in variables: + error('Missing fusinv_server variable') + parameters = '/S /acceptlicense /server="%s" /execmode=service /runnow' % (variables['fusinv_server']) + if 'fusinv_user' in variables and 'fusinv_pass' in variables: + parameters = parameters + ' /user="%s" /password="%s"' % (variables['fusinv_user'],variables['fusinv_pass']) + + + print('installing Fusion inventory agent') + versionpaquet = control['version'].split('-',1)[0] + if iswin64(): + install_exe_if_needed("fusioninventory-agent_windows-x64_%s.exe" % versionpaquet,parameters,key=key,min_version=versionpaquet) + else: + install_exe_if_needed("fusioninventory-agent_windows-x86_%s.exe" % versionpaquet,parameters,key=key,min_version=versionpaquet)