From d836fc4c995e710eb3772395032f7fd9062e633e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=AD=20Climent?= <marticlilop@gmail.com>
Date: Fri, 1 Oct 2021 20:59:05 +0200
Subject: [PATCH] update build files

---
 installer.iss     | 25 +++++++++++++++++++------
 wingetui/Win.spec |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/installer.iss b/installer.iss
index 54a508b3e..009e7bd35 100644
--- a/installer.iss
+++ b/installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "WingetUI Store"
-#define MyAppVersion "0.2"
+#define MyAppVersion "0.4"
 #define MyAppPublisher "SomePythonThings"
 #define MyAppURL "https://www.somepythonthings.tk/"
 #define MyAppExeName "WingetUI Store.exe"
@@ -18,25 +18,38 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName="{autopf}\WingetUI Store v0.2"
+DefaultDirName="{autopf}\WingetUI Store v0.4"
 DisableProgramGroupPage=yes
 ; Remove the following line to run in administrative install mode (install for all users.)
 PrivilegesRequired=lowest
 OutputBaseFilename=WingetUI Store Installer
-SetupIconFile=C:\Users\marti\SPTPrograms\WinGetUI\wingetui\icon.ico
+SetupIconFile=Y:\WinGetUI-Store\wingetui\icon.ico
 Compression=lzma
 SolidCompression=yes
 WizardStyle=classic
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
-
+[Code]
+procedure InitializeWizard;
+begin
+  WizardForm.Bevel.Visible := False;
+  WizardForm.Bevel1.Visible := True;
+end;
+
+procedure TaskKill(FileName: String);
+var
+  ResultCode: Integer;
+begin
+    Exec('taskkill.exe', '/f /im ' + '"' + FileName + '"', '', SW_HIDE,
+     ewWaitUntilTerminated, ResultCode);
+end;
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "C:\Users\marti\SPTPrograms\WinGetUI\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion 
-Source: "C:\Users\marti\SPTPrograms\WinGetUI\remove-old.cmd"; DestDir: "{app}"; Flags: deleteafterinstall
+Source: "Y:\WinGetUI-Store\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; BeforeInstall: TaskKill('WingetUI Store.exe')
+Source: "Y:\WinGetUI-Store\remove-old.cmd"; DestDir: "{app}"; Flags: deleteafterinstall
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/wingetui/Win.spec b/wingetui/Win.spec
index e709d99b0..b5158bb52 100644
--- a/wingetui/Win.spec
+++ b/wingetui/Win.spec
@@ -11,7 +11,7 @@ package_imports = [['qtmodern', ['resources/frameless.qss', 'resources/style.qss
 a = Analysis(['__init__.py'],
              pathex=['Y:\WingetUI-Store\wingetui'],
              binaries=[('MainWindow.py', '.'), ('Tabs.py', '.'), ('Tools.py', '.'), ('WingetTools.py', '.'), ('ScoopTools.py', '.')],
-             datas=[('*.png', '.'), ('*.gif', '.'), ('*.ico', '.')],
+             datas=[('*.png', '.'), ('*.gif', '.'), ('*.ico', '.'), ('*.cmd', '.'), ("winget-cli/", "winget-cli/")],
              hiddenimports=['pkg_resources.py2_warn', "darkdetect", "qtmodern",],
              hookspath=[],
              runtime_hooks=[],