fws
/
wapt-chrome
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Chrome is not always in programfiles

Browse Source
master
Daniel Berteaud 4 years ago
parent 3d6a9e4f52
commit b3cc5ef13f
2 changed files with 8 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      WAPT/control
  2. 7
      setup.py

8
WAPT/control
Unescape View File

@ -1,5 +1,5 @@
package : fws-chrome package : fws-chrome
version : 85.0.4183.83-3 version : 85.0.4183.83-4
architecture : all architecture : all
section : base section : base
priority : optional priority : optional
@ -31,13 +31,13 @@ editor : Google
keywords : browser,navigateur,Google,Chrome,Chromium keywords : browser,navigateur,Google,Chrome,Chromium
licence : Freeware licence : Freeware
homepage : https://www.google.com/chrome/ homepage : https://www.google.com/chrome/
package_uuid : 7322938b-abc4-41d9-aedc-cdb9236cc8b4 package_uuid : 97ab41e9-9a1c-4267-90d3-0112be6563d2
valid_from : valid_from :
valid_until : valid_until :
forced_install_on : forced_install_on :
changelog : changelog :
signer : Daniel Berteaud signer : Daniel Berteaud
signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a
signature : QWtyKFeBQoiz5MiqTGeLZmFy4+GAkbgFDgHEqOCqyal8JO6Im4RktUGjyw81DU/u+57m4sbecRK560+ci99WoRakaz5Kn0PfRHI4LKxlDHIdlfnVzOHDJtfvfqH/jCt9f627aoihNCFcCe+Tf+CP/g1yik5/647MAut6TOBbhiEpWc0iXQByHaQ+lZwWVL9ydkJdNOumIyLBLQuyA+b5f5DH6FqiYQxRU5KlLZhw8k62RRCyoJhJGy7QzE5tIjzX0ApNMIj/718VfwDrEQP0DmMyL9f1iVFQuDhogb/kTB8trvBCIAcdxU1QqjiqnTubyprVHvjdaYAbK4V2LlllXg== signature : IQQdlisfsBqvZUQVkP4p17VxHqaubIojaOmCyDvpvP9/PH1AAosd0oVBBw3xWlhweKvJw4bdQBwLqSQbiSNfC5bN/05r1RaZkqkdqzR/vVt37H0AmW2B+dKuGCGmqpEw7Qs0fSkv25/CKhNDBSvIAYSewMAzk51tgHCLR7ns5CjLaQn61K83d/kz4BGxiHRzr7JT11TC0U7x5WHxMsZblzaOy6GGHWcoa1yzccUO7UC2wvWyaQMk0XguT8d9Kdnz/d0r3UD0YLELxkcx7cXcfizV7Cq7T0vEzkYdof5H/qmCdABe51kGeM78uZHQuyMvutgptxQ8QVMSu/JSZYkHUg==
signature_date : 2020-08-27T19:12:43.375000 signature_date : 2020-08-31T11:28:11.321000
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 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

7
setup.py
Unescape View File

@ -9,7 +9,7 @@ variables = {
} }
# Declaring specific app values (TO CHANGE) # Declaring specific app values (TO CHANGE)
chrome_app_path=makepath(programfiles,'Google','Chrome','Application') chrome_app_path=makepath(programfiles32,'Google','Chrome','Application')
chrome_bin_path=makepath(chrome_app_path,'chrome.exe') chrome_bin_path=makepath(chrome_app_path,'chrome.exe')
bin_name = 'googlechromestandaloneenterprise64.msi' if iswin64() else 'googlechromestandaloneenterprise.msi' bin_name = 'googlechromestandaloneenterprise64.msi' if iswin64() else 'googlechromestandaloneenterprise.msi'
@ -43,7 +43,8 @@ def install():
if (not skip) or (force == True) : if (not skip) or (force == True) :
def get_version_chrome(key): def get_version_chrome(key):
return get_file_properties(chrome_bin_path)['ProductVersion'] if isfile(makepath(programfiles,'Google','Chrome','Application','chrome.exe')):
chrome_bin_path = makepath(programfiles,'Google','Chrome','Application','chrome.exe')
install_msi_if_needed(bin_name install_msi_if_needed(bin_name
,min_version=package_version ,min_version=package_version
,get_version=get_version_chrome) ,get_version=get_version_chrome)
@ -84,7 +85,7 @@ def install():
def uninstall(): def uninstall():
print('uninstalling %s' % control.asrequirement()) print('uninstalling %s' % control.asrequirement())
for chrome in installed_softwares('Google CHrome'): for chrome in installed_softwares('Google Chrome'):
print('Uninstalling %s' % chrome['version']) print('Uninstalling %s' % chrome['version'])
run(uninstall_cmd(chrome['key'])) run(uninstall_cmd(chrome['key']))

Write Preview
Loading…
Cancel
Save