diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py index 93e4d231..9ea639ce 100644 --- a/.bin/Scripts/functions/update.py +++ b/.bin/Scripts/functions/update.py @@ -717,7 +717,7 @@ def update_office(): download_to_temp('odt.exe', SOURCE_URLS['Office Deployment Tool']) cmd = [ r'{}\odt.exe'.format(global_vars['TmpDir']), - r'/extract:{}\odt'.format(_out_path), + r'/extract:{}'.format(_out_path), '/quiet', ] run_program(cmd) diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py index 52e5ff38..5272b64d 100644 --- a/.bin/Scripts/settings/launchers.py +++ b/.bin/Scripts/settings/launchers.py @@ -461,61 +461,63 @@ LAUNCHERS = { }, }, r'Installers\Extras\Office\2016': { - 'Home and Business 2016 (x32)': { + 'Home and Business (x32)': { 'L_TYPE': 'Office', 'L_PATH': '2016', 'L_ITEM': '2016_hb_32.xml', 'L_NCMD': 'True', }, - 'Home and Business 2016 (x64)': { + 'Home and Business (x64)': { 'L_TYPE': 'Office', 'L_PATH': '2016', 'L_ITEM': '2016_hb_64.xml', 'L_NCMD': 'True', }, - 'Home and Student 2016 (x32)': { + 'Home and Student (x32)': { 'L_TYPE': 'Office', 'L_PATH': '2016', 'L_ITEM': '2016_hs_32.xml', 'L_NCMD': 'True', }, - 'Home and Student 2016 (x64)': { + 'Home and Student (x64)': { 'L_TYPE': 'Office', 'L_PATH': '2016', 'L_ITEM': '2016_hs_64.xml', 'L_NCMD': 'True', }, - 'Home and Business 2019 (x32)': { + }, + r'Installers\Extras\Office\2019': { + 'Home and Business (x32)': { 'L_TYPE': 'Office', 'L_PATH': '2019', 'L_ITEM': '2019_hb_32.xml', 'L_NCMD': 'True', }, - 'Home and Business 2019 (x64)': { + 'Home and Business (x64)': { 'L_TYPE': 'Office', 'L_PATH': '2019', 'L_ITEM': '2019_hb_64.xml', 'L_NCMD': 'True', }, - 'Home and Student 2019 (x32)': { + 'Home and Student (x32)': { 'L_TYPE': 'Office', 'L_PATH': '2019', 'L_ITEM': '2019_hs_32.xml', 'L_NCMD': 'True', }, - 'Home and Student 2019 (x64)': { + 'Home and Student (x64)': { 'L_TYPE': 'Office', 'L_PATH': '2019', 'L_ITEM': '2019_hs_64.xml', 'L_NCMD': 'True', }, - 'Office 365 2019 (x32)': { + 'Office 365 (x32)': { 'L_TYPE': 'Office', 'L_PATH': '2019', 'L_ITEM': '365_32.xml', 'L_NCMD': 'True', }, - 'Office 365 2019 (x64)': { + 'Office 365 (x64)': { 'L_TYPE': 'Office', 'L_PATH': '2019', 'L_ITEM': '365_64.xml', diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py index d224b221..e3a586a3 100644 --- a/.bin/Scripts/settings/sources.py +++ b/.bin/Scripts/settings/sources.py @@ -24,7 +24,7 @@ SOURCE_URLS = { 'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe', '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', - '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', 'Linux Reader': 'https://www.diskinternals.com/download/Linux_Reader.exe', 'Macs Fan Control': 'https://www.crystalidea.com/downloads/macsfancontrol_setup.exe',