From 4e9cd1f1147c3d31389e0dab19074b934129c191 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 16 Sep 2018 19:21:36 -0600
Subject: [PATCH] Update FastCopy using new installer

---
 .bin/Scripts/functions/update.py | 33 +++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index 6825f9ba..9e1c3e34 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -235,19 +235,34 @@ def update_fastcopy():
     remove_from_kit('FastCopy')
     
     # Download
-    download_to_temp('FastCopy32.zip', SOURCE_URLS['FastCopy32'])
-    download_to_temp('FastCopy64.zip', SOURCE_URLS['FastCopy64'])
-    
-    # Extract
-    extract_temp_to_bin('FastCopy64.zip', 'FastCopy', sz_args=['FastCopy.exe'])
+    download_to_temp('FastCopy.zip', SOURCE_URLS['FastCopy'])
+
+    # Extract installer
+    extract_temp_to_bin('FastCopy.zip', 'FastCopy')
+    _path = r'{}\FastCopy'.format(global_vars['BinDir'])
+    _installer = 'FastCopy354_installer.exe'
+
+    # Extract 64-bit
+    cmd = [
+        r'{}\{}'.format(_path, _installer),
+        '/NOSUBDIR', '/DIR={}'.format(_path),
+        '/EXTRACT64']
+    run_program(cmd)
     shutil.move(
         r'{}\FastCopy\FastCopy.exe'.format(global_vars['BinDir']),
         r'{}\FastCopy\FastCopy64.exe'.format(global_vars['BinDir']))
-    extract_temp_to_bin('FastCopy32.zip', 'FastCopy', sz_args=[r'-x!setup.exe', r'-x!*.dll'])
-    
+
+    # Extract 32-bit
+    cmd = [
+        r'{}\{}'.format(_path, _installer),
+        '/NOSUBDIR', '/DIR={}'.format(_path),
+        '/EXTRACT32']
+    run_program(cmd)
+
     # Cleanup
-    remove_from_temp('FastCopy32.zip')
-    remove_from_temp('FastCopy64.zip')
+    os.remove(r'{}\{}'.format(_path, _installer))
+    os.remove(r'{}\setup.exe'.format(_path, _installer))
+    remove_from_temp('FastCopy.zip')
 
 def update_wimlib():
     # Stop running processes