From c13c3d76807c47446e2e6b6b0f8b1ddd38719ba7 Mon Sep 17 00:00:00 2001
From: DSR! <xchwarze@gmail.com>
Date: Fri, 27 May 2022 22:27:12 -0300
Subject: [PATCH] Changes in installer

---
 {bin/sendto => assets/icons}/toolkit.ico | Bin
 bin/installer/setup.iss                  |   7 ++++---
 extras/ghidra-setup.iss                  |  20 +++++++++++---------
 3 files changed, 15 insertions(+), 12 deletions(-)
 rename {bin/sendto => assets/icons}/toolkit.ico (100%)

diff --git a/bin/sendto/toolkit.ico b/assets/icons/toolkit.ico
similarity index 100%
rename from bin/sendto/toolkit.ico
rename to assets/icons/toolkit.ico
diff --git a/bin/installer/setup.iss b/bin/installer/setup.iss
index 9214e2f..3f8a793 100644
--- a/bin/installer/setup.iss
+++ b/bin/installer/setup.iss
@@ -30,7 +30,8 @@ Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
 ArchitecturesInstallIn64BitMode=x64
-SetupIconFile="{#MySrcDir}\bin\sendto\toolkit.ico"
+SetupIconFile="{#MySrcDir}\assets\icons\toolkit.ico"
+UninstallDisplayIcon="{#MyAppToolsIconsFolder}\toolkit.ico"
 OutputDir={#MyOutputDir}
 
 [Languages]
@@ -115,10 +116,10 @@ Source: "{#MySrcDir}\bin\sendto\*"; Destdir: "{#MyAppBinsFolder}\sendto\";
 
 [Icons]
 ; x64
-Name: "{userdesktop}\{#MyAppName}\Menu"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x64.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppBinsFolder}\sendto\toolkit.ico"; Check: Is64BitInstallMode
+Name: "{userdesktop}\{#MyAppName}\Menu"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x64.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppToolsIconsFolder}\toolkit.ico"; Check: Is64BitInstallMode
 
 ; x32
-Name: "{userdesktop}\{#MyAppName}\Menu"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x86.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppBinsFolder}\sendto\toolkit.ico"; Check: not Is64BitInstallMode
+Name: "{userdesktop}\{#MyAppName}\Menu"; Filename: "{#MyAppBinsFolder}\sendto\sendto_x86.exe"; WorkingDir: "{#MyAppBinsFolder}\sendto\"; IconFilename: "{#MyAppToolsIconsFolder}\toolkit.ico"; Check: not Is64BitInstallMode
 
 
 ; Force delete all files
diff --git a/extras/ghidra-setup.iss b/extras/ghidra-setup.iss
index f8f42d0..d145232 100644
--- a/extras/ghidra-setup.iss
+++ b/extras/ghidra-setup.iss
@@ -1,8 +1,9 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "Indetectables Toolkit Extras"
-#define MyAppVersion "2022.5"
+#define MyAppName "Indetectables Toolkit Extras Ghidra"
+#define MyAppNameOriginal "Indetectables Toolkit"
+#define MyAppVersion "2022.5.1"
 #define MyAppPublisher "Indetectables"
 #define MyAppURL "https://www.indetectables.net/"
 #define MyAppToolsFolder "{app}\toolkit"
@@ -12,7 +13,7 @@
 #define MyOutputDir "D:\code\indetectables"
 
 [Setup]
-AppId={{1FF89DD9-2D8E-4959-B670-2344285F456B}
+AppId={{3F02E24E-404C-415F-A360-C52C612E5127}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 VersionInfoVersion={#MyAppVersion}
@@ -21,8 +22,8 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={autopf}\{#MyAppName}
-DefaultGroupName={#MyAppName}
+DefaultDirName={autopf}\{#MyAppNameOriginal}
+DefaultGroupName={#MyAppNameOriginal}
 PrivilegesRequired=admin
 ;PrivilegesRequiredOverridesAllowed=dialog
 OutputBaseFilename=Toolkit_{#MyAppVersion}_Extras_Ghidra
@@ -30,8 +31,9 @@ Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
 ArchitecturesInstallIn64BitMode=x64
-SetupIconFile="{#MySrcDir}\bin\sendto\toolkit.ico"
+SetupIconFile="{#MySrcDir}\assets\icons\toolkit.ico"
 OutputDir={#MyOutputDir}
+Uninstallable=no
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -59,8 +61,8 @@ Source: "{#MySrcDir}\bin\auto-config-tools\*"; DestDir: "{#MyAppBinsFolder}\auto
 Source: "{#MySrcDir}\bin\hstart\*"; Destdir: "{#MyAppBinsFolder}\hstart\"; Components: "updater\main"; Flags: ignoreversion recursesubdirs createallsubdirs;
 
 [Icons]
-Name: "{group}\{#MyAppName}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
-Name: "{userdesktop}\{#MyAppName}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
+Name: "{group}\{#MyAppNameOriginal}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
+Name: "{userdesktop}\{#MyAppNameOriginal}\Toolkit Updater"; Filename: "{#MyAppBinsFolder}\updater\updater.exe"; WorkingDir: "{#MyAppBinsFolder}\updater"; Components: "updater\main";
 
 ; Fix default update config
 [INI]
@@ -100,5 +102,5 @@ Filename: "{#MyAppBinsFolder}\auto-config-tools\auto-config-tools.exe"; Paramete
 
 
 [Icons]
-Name: "{group}\{#MyAppName}\Ghidra"; Filename: "{#MyAppToolsFolder}\Dissasembler\Ghidra\ghidraRun.bat"; WorkingDir: "{#MyAppToolsFolder}\Dissasembler\Ghidra"; IconFilename: "{#MyAppToolsIconsFolder}\ghidra.ico"
+Name: "{group}\{#MyAppNameOriginal}\Ghidra"; Filename: "{#MyAppToolsFolder}\Dissasembler\Ghidra\ghidraRun.bat"; WorkingDir: "{#MyAppToolsFolder}\Dissasembler\Ghidra"; IconFilename: "{#MyAppToolsIconsFolder}\ghidra.ico"
 Name: "{#MyAppBinsFolder}\sendto\sendto\Dissasembler\Ghidra"; Filename: "{#MyAppToolsFolder}\Dissasembler\Ghidra\ghidraRun.bat"; WorkingDir: "{#MyAppToolsFolder}\Dissasembler\Ghidra"; IconFilename: "{#MyAppToolsIconsFolder}\ghidra.ico"