Removed Office 2013 sections

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

View file

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

View file

@ -587,8 +587,8 @@ def update_office():
if os.path.exists(include_path):
shutil.copytree(include_path, dest)
for year in ['2016']:
# 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])
@ -603,8 +603,7 @@ def update_office():
r'{}\_Office\{}'.format(global_vars['CBinDir'], year))
# Cleanup
remove_from_temp('odt2013.exe')
remove_from_temp('odt2016.exe')
remove_from_temp('odt{}.exe'.format(year))
def update_classic_start_skin():
# Remove existing folders

View file

@ -356,32 +356,6 @@ LAUNCHERS = {
'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': {
'Home and Business 2016 (x32)': {
'L_TYPE': 'Office',