From 1df64c30f802781ca3dfb8e8886dac9ac98e82a4 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 5 May 2019 14:42:58 -0600 Subject: [PATCH] Include offline LibreOffice installer --- .bin/Scripts/functions/update.py | 17 +++++++++++++++++ .bin/Scripts/settings/sources.py | 1 + .bin/Scripts/update_kit.py | 1 + 3 files changed, 19 insertions(+) diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py index 6ebc52f2..76d4ded6 100755 --- a/.bin/Scripts/functions/update.py +++ b/.bin/Scripts/functions/update.py @@ -702,6 +702,23 @@ def update_eset_config(): if os.path.exists(include_path): shutil.copytree(include_path, dest) + +def update_libreoffice(): + # Prep + dest = r'{}\Installers\Extras\Office'.format( + global_vars['BaseDir']) + + # Remove existing installer + try: + os.remove(r'{}\LibreOffice.msi'.format(dest)) + except FileNotFoundError: + pass + + # Download + download_generic( + dest, 'LibreOffice.msi', SOURCE_URLS['LibreOffice']) + + def update_macs_fan_control(): # Prep dest = r'{}\Installers'.format( diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py index 517add65..e3ac0753 100644 --- a/.bin/Scripts/settings/sources.py +++ b/.bin/Scripts/settings/sources.py @@ -26,6 +26,7 @@ SOURCE_URLS = { 'Intel SSD Toolbox': r'https://downloadmirror.intel.com/28593/eng/Intel%20SSD%20Toolbox%20-%20v3.5.9.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', + 'LibreOffice': 'https://www.libreoffice.org/donate/dl/win-x86_64/6.2.3/en-US/LibreOffice_6.2.3_Win_x64.msi', 'Linux Reader': 'https://www.diskinternals.com/download/Linux_Reader.exe', 'Macs Fan Control': 'https://www.crystalidea.com/downloads/macsfancontrol_setup.exe', 'NirCmd32': 'https://www.nirsoft.net/utils/nircmd.zip', diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py index 07d8f685..813ed55b 100644 --- a/.bin/Scripts/update_kit.py +++ b/.bin/Scripts/update_kit.py @@ -60,6 +60,7 @@ if __name__ == '__main__': print_info(' Installers') try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results, width=40) try_and_print(message='ESET Configs...', function=update_eset_config, other_results=other_results, width=40) + try_and_print(message='LibreOffice...', function=update_libreoffice, other_results=other_results, width=40) try_and_print(message='Macs Fan Control...', function=update_macs_fan_control, other_results=other_results, width=40) try_and_print(message='MS Office...', function=update_office, other_results=other_results, width=40) try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results, width=40)