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

Removed Office 2013 sections

Browse source
This commit is contained in:
2Shirt 2018-09-16 20:02:15 -06:00
parent d502f769ea
commit 1e6eb26c77
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
3 changed files with 5 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.bin/Scripts/Launch.cmd
View file

@ -150,7 +150,6 @@ goto Exit
:LaunchOffice :LaunchOffice
call "%bin%\Scripts\init_client_dir.cmd" /Office call "%bin%\Scripts\init_client_dir.cmd" /Office
set "_odt=False" set "_odt=False"
if %L_PATH% equ 2013 (set "_odt=True")
if %L_PATH% equ 2016 (set "_odt=True") if %L_PATH% equ 2016 (set "_odt=True")
if "%_odt%" == "True" ( if "%_odt%" == "True" (
goto LaunchOfficeODT goto LaunchOfficeODT
@ -493,4 +492,4 @@ goto Exit
:Exit :Exit
popd popd
endlocal endlocal
exit /b %errorlevel% exit /b %errorlevel%

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

@ -587,8 +587,8 @@ def update_office():
if os.path.exists(include_path): if os.path.exists(include_path):
shutil.copytree(include_path, dest) shutil.copytree(include_path, dest)
# Download and extract for year in ['2016']:
for year in ['2013', '2016']: # Download and extract
name = 'odt{}.exe'.format(year) name = 'odt{}.exe'.format(year)
url = 'Office Deployment Tool {}'.format(year) url = 'Office Deployment Tool {}'.format(year)
download_to_temp(name, SOURCE_URLS[url]) download_to_temp(name, SOURCE_URLS[url])
@ -602,9 +602,8 @@ def update_office():
r'{}\{}'.format(global_vars['TmpDir'], year), r'{}\{}'.format(global_vars['TmpDir'], year),
r'{}\_Office\{}'.format(global_vars['CBinDir'], year)) r'{}\_Office\{}'.format(global_vars['CBinDir'], year))
# Cleanup # Cleanup
remove_from_temp('odt2013.exe') remove_from_temp('odt{}.exe'.format(year))
remove_from_temp('odt2016.exe')
def update_classic_start_skin(): def update_classic_start_skin():
# Remove existing folders # Remove existing folders

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

@ -356,32 +356,6 @@ LAUNCHERS = {
'L_ELEV': 'True', 'L_ELEV': 'True',
}, },
}, },
r'Installers\Extras\Office\2013': {
'Home and Business 2013 (x32)': {
'L_TYPE': 'Office',
'L_PATH': '2013',
'L_ITEM': 'hb_32.xml',
'L_NCMD': 'True',
},
'Home and Business 2013 (x64)': {
'L_TYPE': 'Office',
'L_PATH': '2013',
'L_ITEM': 'hb_64.xml',
'L_NCMD': 'True',
},
'Home and Student 2013 (x32)': {
'L_TYPE': 'Office',
'L_PATH': '2013',
'L_ITEM': 'hs_32.xml',
'L_NCMD': 'True',
},
'Home and Student 2013 (x64)': {
'L_TYPE': 'Office',
'L_PATH': '2013',
'L_ITEM': 'hs_64.xml',
'L_NCMD': 'True',
},
},
r'Installers\Extras\Office\2016': { r'Installers\Extras\Office\2016': {
'Home and Business 2016 (x32)': { 'Home and Business 2016 (x32)': {
'L_TYPE': 'Office', 'L_TYPE': 'Office',