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

Bugfix Office sections

Browse source 
* Addresses issue #86
This commit is contained in:
2Shirt 2019-01-11 13:25:33 -07:00
parent 4a96736592
commit cb072366e0
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bin/Scripts/Launch.cmd
View file

@ -163,7 +163,7 @@ rem Prep
set "args=-aoa -bso0 -bse0 -bsp0 -p%ARCHIVE_PASSWORD%" set "args=-aoa -bso0 -bse0 -bsp0 -p%ARCHIVE_PASSWORD%"
set "config=%L_ITEM%" set "config=%L_ITEM%"
set "dest=%client_dir%\Office\ODT" set "dest=%client_dir%\Office\ODT"
set "odt_exe=%L_PATH%\setup.exe" set "odt_exe=setup.exe"
set "source=%cbin%\_Office.7z" set "source=%cbin%\_Office.7z"
rem Extract rem Extract

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

@ -626,21 +626,21 @@ def update_office():
shutil.copytree(include_path, dest) shutil.copytree(include_path, dest)
# Download and extract # Download and extract
_odt = 'odt.exe' _out_path = r'{}\odt'.format(global_vars['TmpDir'])
_out_path = r'{}\odt'
download_to_temp('odt.exe', SOURCE_URLS['Office Deployment Tool']) download_to_temp('odt.exe', SOURCE_URLS['Office Deployment Tool'])
cmd = [ cmd = [
odt, r'{}\odt.exe'.format(global_vars['TmpDir']),
r'/extract:{}\odt'.format(global_vars['TmpDir']), r'/extract:{}\odt'.format(_out_path),
'/quiet', '/quiet',
] ]
run_program(cmd) run_program(cmd)
shutil.move( shutil.move(
_out_path, r'{}\setup.exe'.format(_out_path),
r'{}\_Office'.format(global_vars['CBinDir'])) r'{}\_Office'.format(global_vars['CBinDir']))
# Cleanup # Cleanup
remove_from_temp(odt.exe) remove_from_temp('odt')
remove_from_temp('odt.exe')
def update_classic_start_skin(): def update_classic_start_skin():