diff --git a/WAPT/control b/WAPT/control index 6ba165f..030f4d3 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,5 +1,5 @@ package : fws-chrome -version : 85.0.4183.83-2 +version : 85.0.4183.83-3 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 : 0b3260c7-72d3-4f00-bda8-f54be9886b46 +package_uuid : 7322938b-abc4-41d9-aedc-cdb9236cc8b4 valid_from : valid_until : forced_install_on : changelog : signer : Daniel Berteaud signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a -signature : Mg4p92dwUTOiAX0DrRIvdMNIhmYsP2SrqUzD4GLjSYqDvgdeEpFZAUq29jCTkOOSMJMI2wSK5Fvczg8GrRo4YYvHt8OgBl07alSVgAeAj2SxDdboHdyQVkgvvatUE+hLEpngPXhRGoXTfRFDUt1tlJpwoufvsPe4Z7YWtyovNww0aBAJQ25I30W6wSrfW+MkbCtMvr5k6LgFMj2H6WogRF7jnMxJvtkV1zaS3dTw/q6MI/AkIzv5dnyyskVVecChzkoT8o78fnzgWvGCFJAaVTLP0WhKr/LGqBh7630m5o+lhIq1zhpOSgZOQzJxB4xWUr3zZGRtxzKcVOay2ghoHQ== -signature_date : 2020-08-26T17:00:30.330000 +signature : QWtyKFeBQoiz5MiqTGeLZmFy4+GAkbgFDgHEqOCqyal8JO6Im4RktUGjyw81DU/u+57m4sbecRK560+ci99WoRakaz5Kn0PfRHI4LKxlDHIdlfnVzOHDJtfvfqH/jCt9f627aoihNCFcCe+Tf+CP/g1yik5/647MAut6TOBbhiEpWc0iXQByHaQ+lZwWVL9ydkJdNOumIyLBLQuyA+b5f5DH6FqiYQxRU5KlLZhw8k62RRCyoJhJGy7QzE5tIjzX0ApNMIj/718VfwDrEQP0DmMyL9f1iVFQuDhogb/kTB8trvBCIAcdxU1QqjiqnTubyprVHvjdaYAbK4V2LlllXg== +signature_date : 2020-08-27T19:12:43.375000 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 \ No newline at end of file diff --git a/setup.py b/setup.py index 48122af..6ee6be1 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ variables = { } # Declaring specific app values (TO CHANGE) -chrome_app_path=makepath(programfiles32,'Google','Chrome','Application') +chrome_app_path=makepath(programfiles,'Google','Chrome','Application') chrome_bin_path=makepath(chrome_app_path,'chrome.exe') bin_name = 'googlechromestandaloneenterprise64.msi' if iswin64() else 'googlechromestandaloneenterprise.msi' @@ -84,10 +84,9 @@ def install(): def uninstall(): print('uninstalling %s' % control.asrequirement()) - if uninstall_key_exists('Google Chrome'): - if not "msiexec" in ' '.join(list(uninstall_cmd('Google Chrome'))).lower(): - versionsoft = get_file_properties(chrome_bin_path)['ProductVersion'] - run('"%s" --uninstall --system-level --force-uninstall --qn' % makepath(install_location('Google Chrome'),versionsoft,'Installer','setup.exe'),accept_returncodes=[19]) + for chrome in installed_softwares('Google CHrome'): + print('Uninstalling %s' % chrome['version']) + run(uninstall_cmd(chrome['key'])) def session_setup():