From 1e6eb26c779c8e54a3e94fd216ccefe4c541e739 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 16 Sep 2018 20:02:15 -0600
Subject: [PATCH] Removed Office 2013 sections

---
 .bin/Scripts/Launch.cmd            |  3 +--
 .bin/Scripts/functions/update.py   |  9 ++++-----
 .bin/Scripts/settings/launchers.py | 26 --------------------------
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/.bin/Scripts/Launch.cmd b/.bin/Scripts/Launch.cmd
index 2364dcc8..f7080adb 100644
--- a/.bin/Scripts/Launch.cmd
+++ b/.bin/Scripts/Launch.cmd
@@ -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
@@ -493,4 +492,4 @@ goto Exit
 :Exit
 popd
 endlocal
-exit /b %errorlevel%
\ No newline at end of file
+exit /b %errorlevel%
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index 54e64aad..3389d3f4 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -587,8 +587,8 @@ def update_office():
     if os.path.exists(include_path):
         shutil.copytree(include_path, dest)
     
-    # Download and extract
-    for year in ['2013', '2016']:
+    for year in ['2016']:
+        # Download and extract
         name = 'odt{}.exe'.format(year)
         url = 'Office Deployment Tool {}'.format(year)
         download_to_temp(name, SOURCE_URLS[url])
@@ -602,9 +602,8 @@ def update_office():
             r'{}\{}'.format(global_vars['TmpDir'], year),
             r'{}\_Office\{}'.format(global_vars['CBinDir'], year))
     
-    # Cleanup
-    remove_from_temp('odt2013.exe')
-    remove_from_temp('odt2016.exe')
+        # Cleanup
+        remove_from_temp('odt{}.exe'.format(year))
 
 def update_classic_start_skin():
     # Remove existing folders
diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py
index e2d74832..a125a1f8 100644
--- a/.bin/Scripts/settings/launchers.py
+++ b/.bin/Scripts/settings/launchers.py
@@ -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',