From 2527001ce639f67d0163d25352ef021a37560700 Mon Sep 17 00:00:00 2001 From: DSR! Date: Mon, 31 Jul 2023 19:09:20 -0300 Subject: [PATCH] Update installers --- bin/installer/full/sections/cli.iss | 2 + bin/installer/full/sections/other.iss | 49 +++++++++++++++++-- bin/installer/full/sections/reverse.iss | 17 +++++++ bin/installer/full/setup.iss | 2 +- bin/installer/generate-sections.py | 3 ++ ...{clean-old-tools.bat => prepare-tools.bat} | 3 +- bin/installer/lite/sections/cli.iss | 2 + bin/installer/lite/sections/other.iss | 26 ++++++++++ bin/installer/lite/sections/reverse.iss | 17 +++++++ bin/installer/lite/setup.iss | 2 +- 10 files changed, 115 insertions(+), 8 deletions(-) rename bin/installer/lite/{clean-old-tools.bat => prepare-tools.bat} (93%) diff --git a/bin/installer/full/sections/cli.iss b/bin/installer/full/sections/cli.iss index 351e5ca..124c987 100644 --- a/bin/installer/full/sections/cli.iss +++ b/bin/installer/full/sections/cli.iss @@ -58,6 +58,7 @@ begin if WizardIsComponentSelected('monitor\hollowshunter') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Monitor\HollowsHunter'); if WizardIsComponentSelected('monitor\pesieve') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Monitor\PE-sieve'); if WizardIsComponentSelected('other\floss') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\FLOSS'); + if WizardIsComponentSelected('other\malunpack') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\MalUnpack'); if WizardIsComponentSelected('other\rawcap') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\RawCap'); if WizardIsComponentSelected('other\strings') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\Strings'); if WizardIsComponentSelected('reverse\extremedumper') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Reverse\ExtremeDumper'); @@ -75,6 +76,7 @@ begin EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Monitor\HollowsHunter'); EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Monitor\PE-sieve'); EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\FLOSS'); + EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\MalUnpack'); EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\RawCap'); EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\Strings'); EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Reverse\ExtremeDumper'); diff --git a/bin/installer/full/sections/other.iss b/bin/installer/full/sections/other.iss index a05df7b..9b9c03a 100644 --- a/bin/installer/full/sections/other.iss +++ b/bin/installer/full/sections/other.iss @@ -1,13 +1,13 @@ -; APKEasyTool +; APKEditorStudio [Components] -Name: "other\apkeasytool"; Description: "APKEasyTool"; Types: full; +Name: "other\apkeditorstudio"; Description: "APKEditorStudio"; Types: full; [Files] -Source: "{#MySrcDir}\toolkit\Other\APKEasyTool\*"; DestDir: "{#MyAppToolsFolder}\Other\APKEasyTool"; Components: "other\apkeasytool"; Flags: ignoreversion recursesubdirs createallsubdirs; +Source: "{#MySrcDir}\toolkit\Other\APKEditorStudio\*"; DestDir: "{#MyAppToolsFolder}\Other\APKEditorStudio"; Components: "other\apkeditorstudio"; Flags: ignoreversion recursesubdirs createallsubdirs; [Icons] -Name: "{group}\APKEasyTool"; Filename: "{#MyAppToolsFolder}\Other\APKEasyTool\apkeasytool.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\APKEasyTool"; Components: "other\apkeasytool"; -Name: "{#MyAppBinsFolder}\sendto\sendto\Other\APKEasyTool"; Filename: "{#MyAppToolsFolder}\Other\APKEasyTool\apkeasytool.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\APKEasyTool"; Components: "other\apkeasytool"; +Name: "{group}\APKEditorStudio"; Filename: "{#MyAppToolsFolder}\Other\APKEditorStudio\apk-editor-studio.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\APKEditorStudio"; Components: "other\apkeditorstudio"; +Name: "{#MyAppBinsFolder}\sendto\sendto\Other\APKEditorStudio"; Filename: "{#MyAppToolsFolder}\Other\APKEditorStudio\apk-editor-studio.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\APKEditorStudio"; Components: "other\apkeditorstudio"; @@ -24,6 +24,19 @@ Name: "{#MyAppBinsFolder}\sendto\sendto\Other\ApkStudio x64"; Filename: "{#MyApp +; APKToolGUI +[Components] +Name: "other\apktoolgui"; Description: "APKToolGUI"; Types: full; + +[Files] +Source: "{#MySrcDir}\toolkit\Other\APKToolGUI\*"; DestDir: "{#MyAppToolsFolder}\Other\APKToolGUI"; Components: "other\apktoolgui"; Flags: ignoreversion recursesubdirs createallsubdirs; + +[Icons] +Name: "{group}\APKToolGUI"; Filename: "{#MyAppToolsFolder}\Other\APKToolGUI\APKToolGUI.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\APKToolGUI"; Components: "other\apktoolgui"; +Name: "{#MyAppBinsFolder}\sendto\sendto\Other\APKToolGUI"; Filename: "{#MyAppToolsFolder}\Other\APKToolGUI\APKToolGUI.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\APKToolGUI"; Components: "other\apktoolgui"; + + + ; AstroGrep [Components] Name: "other\astrogrep"; Description: "AstroGrep"; Types: full; @@ -63,6 +76,19 @@ Name: "{#MyAppBinsFolder}\sendto\sendto\Other\HashMyFiles"; Filename: "{#MyAppTo +; MalUnpack +[Components] +Name: "other\malunpack"; Description: "MalUnpack"; Types: full; + +[Files] +Source: "{#MySrcDir}\toolkit\Other\MalUnpack\*"; DestDir: "{#MyAppToolsFolder}\Other\MalUnpack"; Components: "other\malunpack"; Flags: ignoreversion recursesubdirs createallsubdirs; + +[Icons] +Name: "{group}\MalUnpack x64"; Filename: "{sys}\cmd.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\MalUnpack"; Components: "other\malunpack"; Parameters: "/K ""{#MyAppToolsFolder}\Other\MalUnpack\mal_unpack.exe"""; IconFilename: "{#MyAppToolsFolder}\Other\MalUnpack\mal_unpack.exe"; Check: Is64BitInstallMode; +Name: "{#MyAppBinsFolder}\sendto\sendto\Other\MalUnpack x64"; Filename: "{sys}\cmd.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\MalUnpack"; Components: "other\malunpack"; Parameters: "/K ""{#MyAppToolsFolder}\Other\MalUnpack\mal_unpack.exe"""; IconFilename: "{#MyAppToolsFolder}\Other\MalUnpack\mal_unpack.exe"; Check: Is64BitInstallMode; + + + ; ProcDOT [Components] Name: "other\procdot"; Description: "ProcDOT"; Types: full; @@ -148,3 +174,16 @@ Name: "{group}\VirusTotalUploader"; Filename: "{#MyAppToolsFolder}\Other\VirusTo Name: "{#MyAppBinsFolder}\sendto\sendto\Other\VirusTotalUploader"; Filename: "{#MyAppToolsFolder}\Other\VirusTotalUploader\uploader.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\VirusTotalUploader"; Components: "other\virustotaluploader"; + +; WinObjEx64 +[Components] +Name: "other\winobjex64"; Description: "WinObjEx64"; Types: full; + +[Files] +Source: "{#MySrcDir}\toolkit\Other\WinObjEx64\*"; DestDir: "{#MyAppToolsFolder}\Other\WinObjEx64"; Components: "other\winobjex64"; Flags: ignoreversion recursesubdirs createallsubdirs; + +[Icons] +Name: "{group}\WinObjEx64 x64"; Filename: "{#MyAppToolsFolder}\Other\WinObjEx64\WinObjEx64.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\WinObjEx64"; Components: "other\winobjex64"; Check: Is64BitInstallMode; +Name: "{#MyAppBinsFolder}\sendto\sendto\Other\WinObjEx64 x64"; Filename: "{#MyAppToolsFolder}\Other\WinObjEx64\WinObjEx64.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\WinObjEx64"; Components: "other\winobjex64"; Check: Is64BitInstallMode; + + diff --git a/bin/installer/full/sections/reverse.iss b/bin/installer/full/sections/reverse.iss index ab358a1..44cc070 100644 --- a/bin/installer/full/sections/reverse.iss +++ b/bin/installer/full/sections/reverse.iss @@ -1,3 +1,20 @@ +; ASM Calculator +[Components] +Name: "reverse\asmcalculator"; Description: "ASM Calculator"; Types: full; + +[Files] +Source: "{#MySrcDir}\toolkit\Reverse\ASM Calculator\*"; DestDir: "{#MyAppToolsFolder}\Reverse\ASM Calculator"; Components: "reverse\asmcalculator"; Flags: ignoreversion recursesubdirs createallsubdirs; + +[Icons] +Name: "{group}\ASM Calculator"; Filename: "{#MyAppToolsFolder}\Reverse\ASM Calculator\calc32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\ASM Calculator"; Components: "reverse\asmcalculator"; Check: not Is64BitInstallMode; +Name: "{#MyAppBinsFolder}\sendto\sendto\Reverse\ASM Calculator"; Filename: "{#MyAppToolsFolder}\Reverse\ASM Calculator\calc32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\ASM Calculator"; Components: "reverse\asmcalculator"; Check: not Is64BitInstallMode; + +[Icons] +Name: "{group}\ASM Calculator"; Filename: "{#MyAppToolsFolder}\Reverse\ASM Calculator\conv32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\ASM Calculator"; Components: "reverse\asmcalculator"; Check: not Is64BitInstallMode; +Name: "{#MyAppBinsFolder}\sendto\sendto\Reverse\ASM Calculator"; Filename: "{#MyAppToolsFolder}\Reverse\ASM Calculator\conv32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\ASM Calculator"; Components: "reverse\asmcalculator"; Check: not Is64BitInstallMode; + + + ; AT4RE Patcher [Components] Name: "reverse\at4repatcher"; Description: "AT4RE Patcher"; Types: full; diff --git a/bin/installer/full/setup.iss b/bin/installer/full/setup.iss index 855581d..ab3c4d5 100644 --- a/bin/installer/full/setup.iss +++ b/bin/installer/full/setup.iss @@ -3,7 +3,7 @@ #define MyAppName "Indetectables Toolkit" #define MyAppNameOriginal "Indetectables Toolkit" -#define MyAppVersion "2023.3" +#define MyAppVersion "2023.8" #define MyAppPublisher "Indetectables" #define MyAppURL "https://www.indetectables.net/" #define MyAppToolsFolder "{app}\toolkit" diff --git a/bin/installer/generate-sections.py b/bin/installer/generate-sections.py index 8e1ba2c..64b7ac7 100644 --- a/bin/installer/generate-sections.py +++ b/bin/installer/generate-sections.py @@ -75,6 +75,9 @@ class GenerateInstall: 'winapi search': ['winapisearch32.exe', 'winapisearch64.exe'], 'de4dot': ['de4dot.exe', 'de4dot-x64.exe'], 'netunpack': ['netunpack.exe', 'netunpack-64.exe'], + + # support other tools in package + 'asm calculator': ['calc32.exe', 'conv32.exe'], } self.fix_tool_exe_link_creation = [ # analysis diff --git a/bin/installer/lite/clean-old-tools.bat b/bin/installer/lite/prepare-tools.bat similarity index 93% rename from bin/installer/lite/clean-old-tools.bat rename to bin/installer/lite/prepare-tools.bat index 793046f..5519fdd 100644 --- a/bin/installer/lite/clean-old-tools.bat +++ b/bin/installer/lite/prepare-tools.bat @@ -31,7 +31,8 @@ RMDIR "toolkit\Monitor\SysAnalyzer" /S /Q RMDIR "toolkit\NFOMaker" /S /Q :: Other -RMDIR "toolkit\Other\APKEasyTool" /S /Q +RMDIR "toolkit\Other\APKEditorStudio" /S /Q +RMDIR "toolkit\Other\APKToolGUI" /S /Q RMDIR "toolkit\Other\AstroGrep" /S /Q RMDIR "toolkit\Other\ProcDOT" /S /Q diff --git a/bin/installer/lite/sections/cli.iss b/bin/installer/lite/sections/cli.iss index bfce75c..9719f15 100644 --- a/bin/installer/lite/sections/cli.iss +++ b/bin/installer/lite/sections/cli.iss @@ -56,6 +56,7 @@ begin if WizardIsComponentSelected('analysis\capa') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Analysis\CAPA'); if WizardIsComponentSelected('monitor\pesieve') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Monitor\PE-sieve'); if WizardIsComponentSelected('other\floss') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\FLOSS'); + if WizardIsComponentSelected('other\malunpack') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\MalUnpack'); if WizardIsComponentSelected('other\rawcap') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\RawCap'); if WizardIsComponentSelected('other\strings') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\Strings'); if WizardIsComponentSelected('reverse\extremedumper') then EnvAddPath(ExpandConstant('{#MyAppToolsFolder}') + '\Reverse\ExtremeDumper'); @@ -71,6 +72,7 @@ begin EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Analysis\CAPA'); EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Monitor\PE-sieve'); EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\FLOSS'); + EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\MalUnpack'); EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\RawCap'); EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Other\Strings'); EnvRemovePath(ExpandConstant('{#MyAppToolsFolder}') + '\Reverse\ExtremeDumper'); diff --git a/bin/installer/lite/sections/other.iss b/bin/installer/lite/sections/other.iss index 3f70848..73f4083 100644 --- a/bin/installer/lite/sections/other.iss +++ b/bin/installer/lite/sections/other.iss @@ -37,6 +37,19 @@ Name: "{#MyAppBinsFolder}\sendto\sendto\Other\HashMyFiles"; Filename: "{#MyAppTo +; MalUnpack +[Components] +Name: "other\malunpack"; Description: "MalUnpack"; Types: full; + +[Files] +Source: "{#MySrcDir}\toolkit\Other\MalUnpack\*"; DestDir: "{#MyAppToolsFolder}\Other\MalUnpack"; Components: "other\malunpack"; Flags: ignoreversion recursesubdirs createallsubdirs; + +[Icons] +Name: "{group}\MalUnpack x64"; Filename: "{sys}\cmd.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\MalUnpack"; Components: "other\malunpack"; Parameters: "/K ""{#MyAppToolsFolder}\Other\MalUnpack\mal_unpack.exe"""; IconFilename: "{#MyAppToolsFolder}\Other\MalUnpack\mal_unpack.exe"; Check: Is64BitInstallMode; +Name: "{#MyAppBinsFolder}\sendto\sendto\Other\MalUnpack x64"; Filename: "{sys}\cmd.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\MalUnpack"; Components: "other\malunpack"; Parameters: "/K ""{#MyAppToolsFolder}\Other\MalUnpack\mal_unpack.exe"""; IconFilename: "{#MyAppToolsFolder}\Other\MalUnpack\mal_unpack.exe"; Check: Is64BitInstallMode; + + + ; RawCap [Components] Name: "other\rawcap"; Description: "RawCap"; Types: full compact; @@ -105,3 +118,16 @@ Name: "{group}\VirusTotalUploader"; Filename: "{#MyAppToolsFolder}\Other\VirusTo Name: "{#MyAppBinsFolder}\sendto\sendto\Other\VirusTotalUploader"; Filename: "{#MyAppToolsFolder}\Other\VirusTotalUploader\uploader.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\VirusTotalUploader"; Components: "other\virustotaluploader"; + +; WinObjEx64 +[Components] +Name: "other\winobjex64"; Description: "WinObjEx64"; Types: full; + +[Files] +Source: "{#MySrcDir}\toolkit\Other\WinObjEx64\*"; DestDir: "{#MyAppToolsFolder}\Other\WinObjEx64"; Components: "other\winobjex64"; Flags: ignoreversion recursesubdirs createallsubdirs; + +[Icons] +Name: "{group}\WinObjEx64 x64"; Filename: "{#MyAppToolsFolder}\Other\WinObjEx64\WinObjEx64.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\WinObjEx64"; Components: "other\winobjex64"; Check: Is64BitInstallMode; +Name: "{#MyAppBinsFolder}\sendto\sendto\Other\WinObjEx64 x64"; Filename: "{#MyAppToolsFolder}\Other\WinObjEx64\WinObjEx64.exe"; WorkingDir: "{#MyAppToolsFolder}\Other\WinObjEx64"; Components: "other\winobjex64"; Check: Is64BitInstallMode; + + diff --git a/bin/installer/lite/sections/reverse.iss b/bin/installer/lite/sections/reverse.iss index 3677ccb..23f8df9 100644 --- a/bin/installer/lite/sections/reverse.iss +++ b/bin/installer/lite/sections/reverse.iss @@ -1,3 +1,20 @@ +; ASM Calculator +[Components] +Name: "reverse\asmcalculator"; Description: "ASM Calculator"; Types: full; + +[Files] +Source: "{#MySrcDir}\toolkit\Reverse\ASM Calculator\*"; DestDir: "{#MyAppToolsFolder}\Reverse\ASM Calculator"; Components: "reverse\asmcalculator"; Flags: ignoreversion recursesubdirs createallsubdirs; + +[Icons] +Name: "{group}\ASM Calculator"; Filename: "{#MyAppToolsFolder}\Reverse\ASM Calculator\calc32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\ASM Calculator"; Components: "reverse\asmcalculator"; Check: not Is64BitInstallMode; +Name: "{#MyAppBinsFolder}\sendto\sendto\Reverse\ASM Calculator"; Filename: "{#MyAppToolsFolder}\Reverse\ASM Calculator\calc32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\ASM Calculator"; Components: "reverse\asmcalculator"; Check: not Is64BitInstallMode; + +[Icons] +Name: "{group}\ASM Calculator"; Filename: "{#MyAppToolsFolder}\Reverse\ASM Calculator\conv32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\ASM Calculator"; Components: "reverse\asmcalculator"; Check: not Is64BitInstallMode; +Name: "{#MyAppBinsFolder}\sendto\sendto\Reverse\ASM Calculator"; Filename: "{#MyAppToolsFolder}\Reverse\ASM Calculator\conv32.exe"; WorkingDir: "{#MyAppToolsFolder}\Reverse\ASM Calculator"; Components: "reverse\asmcalculator"; Check: not Is64BitInstallMode; + + + ; CryptoTester [Components] Name: "reverse\cryptotester"; Description: "CryptoTester"; Types: full compact; diff --git a/bin/installer/lite/setup.iss b/bin/installer/lite/setup.iss index 351b614..a31d86e 100644 --- a/bin/installer/lite/setup.iss +++ b/bin/installer/lite/setup.iss @@ -3,7 +3,7 @@ #define MyAppName "Indetectables Toolkit Lite" #define MyAppNameOriginal "Indetectables Toolkit" -#define MyAppVersion "2023.3" +#define MyAppVersion "2023.8" #define MyAppPublisher "Indetectables" #define MyAppURL "https://www.indetectables.net/" #define MyAppToolsFolder "{app}\toolkit"