2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
2Shirt 2019-01-11 14:43:41 -07:00
commit da4ae79fcc
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bin/Scripts/functions/update.py
View file

@ -717,7 +717,7 @@ def update_office():
download_to_temp('odt.exe', SOURCE_URLS['Office Deployment Tool']) download_to_temp('odt.exe', SOURCE_URLS['Office Deployment Tool'])
cmd = [ cmd = [
r'{}\odt.exe'.format(global_vars['TmpDir']), r'{}\odt.exe'.format(global_vars['TmpDir']),
r'/extract:{}\odt'.format(_out_path), r'/extract:{}'.format(_out_path),
'/quiet', '/quiet',
] ]
run_program(cmd) run_program(cmd)

22
.bin/Scripts/settings/launchers.py
View file

@ -461,61 +461,63 @@ LAUNCHERS = {
}, },
}, },
r'Installers\Extras\Office\2016': { r'Installers\Extras\Office\2016': {
'Home and Business 2016 (x32)': { 'Home and Business (x32)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',
'L_PATH': '2016', 'L_PATH': '2016',
'L_ITEM': '2016_hb_32.xml', 'L_ITEM': '2016_hb_32.xml',
'L_NCMD': 'True', 'L_NCMD': 'True',
}, },
'Home and Business 2016 (x64)': { 'Home and Business (x64)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',
'L_PATH': '2016', 'L_PATH': '2016',
'L_ITEM': '2016_hb_64.xml', 'L_ITEM': '2016_hb_64.xml',
'L_NCMD': 'True', 'L_NCMD': 'True',
}, },
'Home and Student 2016 (x32)': { 'Home and Student (x32)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',
'L_PATH': '2016', 'L_PATH': '2016',
'L_ITEM': '2016_hs_32.xml', 'L_ITEM': '2016_hs_32.xml',
'L_NCMD': 'True', 'L_NCMD': 'True',
}, },
'Home and Student 2016 (x64)': { 'Home and Student (x64)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',
'L_PATH': '2016', 'L_PATH': '2016',
'L_ITEM': '2016_hs_64.xml', 'L_ITEM': '2016_hs_64.xml',
'L_NCMD': 'True', 'L_NCMD': 'True',
}, },
'Home and Business 2019 (x32)': { },
r'Installers\Extras\Office\2019': {
'Home and Business (x32)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',
'L_PATH': '2019', 'L_PATH': '2019',
'L_ITEM': '2019_hb_32.xml', 'L_ITEM': '2019_hb_32.xml',
'L_NCMD': 'True', 'L_NCMD': 'True',
}, },
'Home and Business 2019 (x64)': { 'Home and Business (x64)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',
'L_PATH': '2019', 'L_PATH': '2019',
'L_ITEM': '2019_hb_64.xml', 'L_ITEM': '2019_hb_64.xml',
'L_NCMD': 'True', 'L_NCMD': 'True',
}, },
'Home and Student 2019 (x32)': { 'Home and Student (x32)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',
'L_PATH': '2019', 'L_PATH': '2019',
'L_ITEM': '2019_hs_32.xml', 'L_ITEM': '2019_hs_32.xml',
'L_NCMD': 'True', 'L_NCMD': 'True',
}, },
'Home and Student 2019 (x64)': { 'Home and Student (x64)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',
'L_PATH': '2019', 'L_PATH': '2019',
'L_ITEM': '2019_hs_64.xml', 'L_ITEM': '2019_hs_64.xml',
'L_NCMD': 'True', 'L_NCMD': 'True',
}, },
'Office 365 2019 (x32)': { 'Office 365 (x32)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',
'L_PATH': '2019', 'L_PATH': '2019',
'L_ITEM': '365_32.xml', 'L_ITEM': '365_32.xml',
'L_NCMD': 'True', 'L_NCMD': 'True',
}, },
'Office 365 2019 (x64)': { 'Office 365 (x64)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',
'L_PATH': '2019', 'L_PATH': '2019',
'L_ITEM': '365_64.xml', 'L_ITEM': '365_64.xml',

2
.bin/Scripts/settings/sources.py
View file

@ -24,7 +24,7 @@ SOURCE_URLS = {
'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe', 'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
'HWiNFO': 'https://www.fosshub.com/HWiNFO.html?dwl=hwi_600.zip', 'HWiNFO': 'https://www.fosshub.com/HWiNFO.html?dwl=hwi_600.zip',
'Intel SSD Toolbox': r'https://downloadmirror.intel.com/28447/eng/Intel%20SSD%20Toolbox%20-%20v3.5.8.exe', 'Intel SSD Toolbox': r'https://downloadmirror.intel.com/28447/eng/Intel%20SSD%20Toolbox%20-%20v3.5.8.exe',
'IOBit_Uninstaller': 'https://portableapps.duckduckgo.com/IObitUninstallerPortable_7.5.0.7.paf.exe', 'IOBit_Uninstaller': r'https://portableapps.com/redirect/?a=IObitUninstallerPortable&s=s&d=pa&f=IObitUninstallerPortable_7.5.0.7.paf.exe',
'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe', 'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
'Linux Reader': 'https://www.diskinternals.com/download/Linux_Reader.exe', 'Linux Reader': 'https://www.diskinternals.com/download/Linux_Reader.exe',
'Macs Fan Control': 'https://www.crystalidea.com/downloads/macsfancontrol_setup.exe', 'Macs Fan Control': 'https://www.crystalidea.com/downloads/macsfancontrol_setup.exe',