More fixe on programfiles vs programfiles32
This commit is contained in:
parent
b3cc5ef13f
commit
4db9a5684b
|
@ -1,5 +1,5 @@
|
|||
package : fws-chrome
|
||||
version : 85.0.4183.83-4
|
||||
version : 85.0.4183.83-9
|
||||
architecture : all
|
||||
section : base
|
||||
priority : optional
|
||||
|
@ -31,13 +31,13 @@ editor : Google
|
|||
keywords : browser,navigateur,Google,Chrome,Chromium
|
||||
licence : Freeware
|
||||
homepage : https://www.google.com/chrome/
|
||||
package_uuid : 97ab41e9-9a1c-4267-90d3-0112be6563d2
|
||||
package_uuid : 2eee51dc-dc8a-42e0-a0d2-06f647a270d8
|
||||
valid_from :
|
||||
valid_until :
|
||||
forced_install_on :
|
||||
changelog :
|
||||
signer : Daniel Berteaud
|
||||
signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a
|
||||
signature : IQQdlisfsBqvZUQVkP4p17VxHqaubIojaOmCyDvpvP9/PH1AAosd0oVBBw3xWlhweKvJw4bdQBwLqSQbiSNfC5bN/05r1RaZkqkdqzR/vVt37H0AmW2B+dKuGCGmqpEw7Qs0fSkv25/CKhNDBSvIAYSewMAzk51tgHCLR7ns5CjLaQn61K83d/kz4BGxiHRzr7JT11TC0U7x5WHxMsZblzaOy6GGHWcoa1yzccUO7UC2wvWyaQMk0XguT8d9Kdnz/d0r3UD0YLELxkcx7cXcfizV7Cq7T0vEzkYdof5H/qmCdABe51kGeM78uZHQuyMvutgptxQ8QVMSu/JSZYkHUg==
|
||||
signature_date : 2020-08-31T11:28:11.321000
|
||||
signature : ME4Qms7az5b1UizVyYvl0C1eyLFNok6reZySyHWSzggVXlBtLeteP0X2CJGPixdgym4AyW6TJjWMkGLxB/XEF/iIpVZCpqQpcgstxRopL3zSvJxZX+cHTbAsLdwzvTwBU8ejIh4MPl2C6L3qq3xrwVr0bdO55BtqGcKrEhRaQcH1aLDalgRIlja7SGRTlVYQF3DXAGSOZz/tcyx0x16FYVIi3tM6yznI9imC/OUf9qrh4kJbh5bYIdWnBSX54HiIN0/0WMcdmsuGa1wk8xt86+puSZt8bOb+Y3wHMk54Efj5TDiR8pKcq/l/QHadGiZi68/aqDI30oZQ7WCSvO8Phg==
|
||||
signature_date : 2020-08-31T12:15:47.301000
|
||||
signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_os_version,max_os_version,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,description_pt,description_it,description_nl,description_ru,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,changelog,signer,signer_fingerprint,signature_date,signed_attributes
|
20
setup.py
20
setup.py
|
@ -8,11 +8,6 @@ variables = {
|
|||
'web_home_page': 'https://google.fr'
|
||||
}
|
||||
|
||||
# Declaring specific app values (TO CHANGE)
|
||||
chrome_app_path=makepath(programfiles32,'Google','Chrome','Application')
|
||||
chrome_bin_path=makepath(chrome_app_path,'chrome.exe')
|
||||
bin_name = 'googlechromestandaloneenterprise64.msi' if iswin64() else 'googlechromestandaloneenterprise.msi'
|
||||
|
||||
def install():
|
||||
|
||||
# Read local variables file if available
|
||||
|
@ -23,6 +18,12 @@ def install():
|
|||
f = Fernet(open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read())
|
||||
variables.update(yaml.safe_load(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
|
||||
|
||||
|
||||
# Declaring specific app values
|
||||
chrome_app_path=makepath(programfiles32,'Google','Chrome','Application')
|
||||
chrome_bin_path=makepath(chrome_app_path,'chrome.exe')
|
||||
bin_name = 'googlechromestandaloneenterprise64.msi' if iswin64() else 'googlechromestandaloneenterprise.msi'
|
||||
|
||||
print('Installing %s' % control.asrequirement())
|
||||
|
||||
# Specific app values
|
||||
|
@ -44,11 +45,18 @@ def install():
|
|||
if (not skip) or (force == True) :
|
||||
def get_version_chrome(key):
|
||||
if isfile(makepath(programfiles,'Google','Chrome','Application','chrome.exe')):
|
||||
chrome_bin_path = makepath(programfiles,'Google','Chrome','Application','chrome.exe')
|
||||
return get_file_properties(makepath(programfiles,'Google','Chrome','Application','chrome.exe'))['ProductVersion']
|
||||
return get_file_properties(chrome_bin_path)['ProductVersion']
|
||||
|
||||
install_msi_if_needed(bin_name
|
||||
,min_version=package_version
|
||||
,get_version=get_version_chrome)
|
||||
|
||||
# Update var after install, as CHrome can be installed either in programfiles or programfiles32
|
||||
if isfile(makepath(programfiles,'Google','Chrome','Application','chrome.exe')):
|
||||
chrome_app_path=makepath(programfiles,'Google','Chrome','Application')
|
||||
chrome_bin_path=makepath(chrome_app_path,'chrome.exe')
|
||||
|
||||
# Disabling Google Chrome auto updates
|
||||
for task in ['GoogleUpdateTaskMachineCore', 'GoogleUpdateTaskMachineUA']:
|
||||
if task_exists(task):
|
||||
|
|
Loading…
Reference in New Issue