From ea4036e14d569b21c24732c8e0b1af1f1ca8d25d Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Mon, 20 Nov 2017 23:10:42 -0800
Subject: [PATCH] Added ODT downloads
---
.bin/Scripts/build_kit.ps1 | 2 +-
.bin/Scripts/functions/update.py | 30 +++++++++++++++++++++++++++++-
.bin/Scripts/settings/sources.py | 2 ++
.bin/Scripts/update_kit.py | 1 +
.cbin/_include/_Office/365_32.xml | 7 +++++++
.cbin/_include/_Office/365_64.xml | 7 +++++++
.cbin/_include/_Office/hb_32.xml | 7 +++++++
.cbin/_include/_Office/hb_64.xml | 7 +++++++
.cbin/_include/_Office/hs_32.xml | 7 +++++++
.cbin/_include/_Office/hs_64.xml | 7 +++++++
.gitignore | 1 +
11 files changed, 76 insertions(+), 2 deletions(-)
create mode 100644 .cbin/_include/_Office/365_32.xml
create mode 100644 .cbin/_include/_Office/365_64.xml
create mode 100644 .cbin/_include/_Office/hb_32.xml
create mode 100644 .cbin/_include/_Office/hb_64.xml
create mode 100644 .cbin/_include/_Office/hs_32.xml
create mode 100644 .cbin/_include/_Office/hs_64.xml
diff --git a/.bin/Scripts/build_kit.ps1 b/.bin/Scripts/build_kit.ps1
index 75d9bff2..187cf058 100644
--- a/.bin/Scripts/build_kit.ps1
+++ b/.bin/Scripts/build_kit.ps1
@@ -177,5 +177,5 @@ popd
if ($errors -gt 0) {
wk_pause "Press Enter to exit..."
} else {
- start "$bin\ConEmu\ConEmu.exe" -argumentlist @("-run", "$bin\Python\x32\python.exe", "$bin\Scripts\update_kit.py", "-new_console:c")
+ start "$bin\ConEmu\ConEmu.exe" -argumentlist @("-run", "$bin\Python\x32\python.exe", "$bin\Scripts\update_kit.py", "-new_console:c") -verb Runas
}
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index 4a34f633..433d7861 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -1,5 +1,4 @@
# Wizard Kit: Functions - Build / Update
-## NOTE: This file is full of magic strings!
import requests
@@ -441,6 +440,35 @@ def update_adobe_reader_dc():
# Download
download_generic(
dest, 'Adobe Reader DC.exe', SOURCE_URLS['Adobe Reader DC'])
+
+def update_office():
+ # Remove existing folders
+ remove_from_kit('_Office')
+
+ # Prep
+ dest = r'{}\_Office'.format(global_vars['CBinDir'])
+ include_path = r'{}\_include\_Office'.format(global_vars['CBinDir'])
+ if os.path.exists(include_path):
+ shutil.copytree(include_path, dest)
+
+ # Download and extract
+ for year in ['2013', '2016']:
+ name = 'odt{}.exe'.format(year)
+ url = 'Office Deployment Tool {}'.format(year)
+ download_to_temp(name, SOURCE_URLS[url])
+ cmd = [
+ r'{}\odt{}.exe'.format(global_vars['TmpDir'], year),
+ r'/extract:{}\{}'.format(global_vars['TmpDir'], year),
+ '/quiet',
+ ]
+ run_program(cmd)
+ shutil.move(
+ r'{}\{}'.format(global_vars['TmpDir'], year),
+ r'{}\_Office\{}'.format(global_vars['CBinDir'], year))
+
+ # Cleanup
+ remove_from_temp('odt2013.exe')
+ remove_from_temp('odt2016.exe')
## Misc ##
def update_everything():
diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py
index 00a23d43..14b9bb77 100644
--- a/.bin/Scripts/settings/sources.py
+++ b/.bin/Scripts/settings/sources.py
@@ -18,6 +18,8 @@ SOURCE_URLS = {
'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
'HWiNFO32': 'http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip',
'HWiNFO64': 'http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip',
+ 'Office Deployment Tool 2013': 'https://download.microsoft.com/download/6/2/3/6230F7A2-D8A9-478B-AC5C-57091B632FCF/officedeploymenttool_x86_4827-1000.exe',
+ 'Office Deployment Tool 2016': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_8529.3600.exe',
'ProduKey32': 'http://www.nirsoft.net/utils/produkey.zip',
'ProduKey64': 'http://www.nirsoft.net/utils/produkey-x64.zip',
'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27330/eng/Intel%20SSD%20Toolbox%20-%20v3.4.9.exe',
diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py
index fc32186b..6868b6c5 100644
--- a/.bin/Scripts/update_kit.py
+++ b/.bin/Scripts/update_kit.py
@@ -54,6 +54,7 @@ if __name__ == '__main__':
# Installers
print_info('\nInstallers')
try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results)
+ try_and_print(message='MS Office...', function=update_office, other_results=other_results)
print_info('\nNinite')
for section in sorted(NINITE_SOURCES.keys()):
print_success(' {}'.format(section))
diff --git a/.cbin/_include/_Office/365_32.xml b/.cbin/_include/_Office/365_32.xml
new file mode 100644
index 00000000..ac20b94d
--- /dev/null
+++ b/.cbin/_include/_Office/365_32.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.cbin/_include/_Office/365_64.xml b/.cbin/_include/_Office/365_64.xml
new file mode 100644
index 00000000..1593ec31
--- /dev/null
+++ b/.cbin/_include/_Office/365_64.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.cbin/_include/_Office/hb_32.xml b/.cbin/_include/_Office/hb_32.xml
new file mode 100644
index 00000000..e3cc6d52
--- /dev/null
+++ b/.cbin/_include/_Office/hb_32.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.cbin/_include/_Office/hb_64.xml b/.cbin/_include/_Office/hb_64.xml
new file mode 100644
index 00000000..119f7bd9
--- /dev/null
+++ b/.cbin/_include/_Office/hb_64.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.cbin/_include/_Office/hs_32.xml b/.cbin/_include/_Office/hs_32.xml
new file mode 100644
index 00000000..bb5190ae
--- /dev/null
+++ b/.cbin/_include/_Office/hs_32.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.cbin/_include/_Office/hs_64.xml b/.cbin/_include/_Office/hs_64.xml
new file mode 100644
index 00000000..f5079d77
--- /dev/null
+++ b/.cbin/_include/_Office/hs_64.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index ee338c3c..8f24a67b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
.cbin/XMPlay/
.cbin/XYplorerFree/
.cbin/_Drivers/
+.cbin/_Office/