From 6e95265a7bf603301f9cbf7a087caef545a94164 Mon Sep 17 00:00:00 2001 From: krypto5863 <29824718+krypto5863@users.noreply.github.com> Date: Fri, 2 Aug 2024 15:25:49 -0400 Subject: [PATCH] 2.6.2 Disabled some components, made old install date info be appended in a localized manner. --- CMI.iss | 6 +++--- Helpers.iss | 15 +++++++++++++++ Installer Files/Files.iss | 2 +- MainCode.iss | 4 ++-- OldInstallHandler.iss | 2 ++ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/CMI.iss b/CMI.iss index 3b2af2a..7df03f8 100644 --- a/CMI.iss +++ b/CMI.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "COM Modular Installer" -#define MyAppVersion "2.6.1" +#define MyAppVersion "2.6.2" #define MyAppURL "https://krypto5863.github.io/COM-Modular-Installer/" #define MyAppUpdates "https://github.com/krypto5863/COM-Modular-Installer/releases" #define MyAppSupport "https://github.com/krypto5863/COM-Modular-Installer/issues" @@ -134,7 +134,7 @@ Name: bepinexPlugs; Description: BepInEx Plugins; Name: bepinexPlugs/InBlock; Description: InputHotkeyBlock; Types: full notr compact eng pic self hen; Name: bepinexPlugs/meidophoto; Description: MeidoPhotoStudio; Types: full notr eng pic self; Name: bepinexPlugs/meidophoto/Poses; Description: 1900 Poses for MPS; Flags: dontinheritcheck; - Name: bepinexPlugs/modref; Description: ModRefresh; Types:full pic self eng notr; + Name: bepinexPlugs/modref; Description: ModRefresh; Name: bepinexPlugs/ShaderServant; Description: ShaderServant; Types: Full notr eng pic self hen; Name: bepinexPlugs/ShapekeyMaster; Description: ShapekeyMaster; Types: Full notr eng pic self hen; Name: bepinexPlugs/ShiftClick; Description: ShiftClickExplorer; Types: Full notr compact eng pic self hen; @@ -161,7 +161,7 @@ Name: Scripts; Description: ScriptLoader Scripts; Name: Scripts/editname; Description: EditableNames Script; Types: Full notr compact eng pic self hen; Name: Scripts/enascout; Description: Enable Scout Mode Script; Name: Scripts/eventcharacterlistfix; Description: EventCharacterListFix Script; Types: Full notr compact eng pic self hen; - Name: Scripts/fastfade; Description: FastFade Script; Types: Full notr eng pic self hen; + //Name: Scripts/fastfade; Description: FastFade Script; Types: Full notr eng pic self hen; Name: Scripts/freeguest; Description: FreeGuest Script; Name: Scripts/forceschedule; Description: ForceScheduleEvents Script; Name: Scripts/invertlearntstat; Description: InvertLearntStat Script; diff --git a/Helpers.iss b/Helpers.iss index a0d622c..e8549a1 100644 --- a/Helpers.iss +++ b/Helpers.iss @@ -43,6 +43,20 @@ begin Result := true; end; +function AppendToName(const Path: String; const Suffix: String): boolean; +begin + + if NOT ShellRename(Path, Path + ' ' + Suffix) then + begin + log('Could not rename: ' + Path + ' to ' + ExtractFileName(Path) + ' ' + Suffix); + result := false; + exit; + end; + + result := true; +end; + +{ type SYSTEMTIME = record Year: WORD; @@ -88,6 +102,7 @@ begin FindClose(FindRec); end; end; +} procedure ApplyCustomPreset(const path: String); var diff --git a/Installer Files/Files.iss b/Installer Files/Files.iss index 0e81489..704372a 100644 --- a/Installer Files/Files.iss +++ b/Installer Files/Files.iss @@ -76,7 +76,7 @@ Source: "{#ibep}\ScriptLoader\Scripts\editable_names.cs"; DestDir: "{app}\script Source: "{#ibep}\ScriptLoader\Scripts\editBlinkStop.cs"; DestDir: "{app}\scripts"; Components:scripts/blinkstop; Flags: {#stdFlags} Source: "{#ibep}\ScriptLoader\Scripts\enable_scout_mode.cs"; DestDir: "{app}\scripts"; Components:scripts/enascout; Flags: {#stdFlags} Source: "{#ibep}\ScriptLoader\Scripts\EventCharacterListFix.cs"; DestDir: "{app}\scripts"; Components:scripts/EventCharacterListFix; Flags: {#stdFlags} -Source: "{#ibep}\ScriptLoader\Scripts\fastFade.cs"; DestDir: "{app}\scripts"; Components:scripts/fastfade; Flags: {#stdFlags} +;Source: "{#ibep}\ScriptLoader\Scripts\fastFade.cs"; DestDir: "{app}\scripts"; Components:scripts/fastfade; Flags: {#stdFlags} Source: "{#ibep}\ScriptLoader\Scripts\freeGuest.cs"; DestDir: "{app}\scripts"; Components:scripts/freeguest; Flags: {#stdFlags} Source: "{#ibep}\ScriptLoader\Scripts\ForceScheduleEvents.cs"; DestDir: "{app}\scripts"; Components:scripts/ForceSchedule; Flags: {#stdFlags} Source: "{#ibep}\ScriptLoader\Scripts\InvertLearntStat.cs"; DestDir: "{app}\scripts"; Components:scripts/InvertLearntStat; Flags: {#stdFlags} diff --git a/MainCode.iss b/MainCode.iss index 84019d2..f899415 100644 --- a/MainCode.iss +++ b/MainCode.iss @@ -179,7 +179,7 @@ begin OldInstallPath := AddBackSlash(path) + 'OldInstall' - while DirExists(OldInstallPath) AND NOT AppendCreationTimeToName(OldInstallPath) do + while DirExists(OldInstallPath) AND NOT AppendToName(OldInstallPath, GetDateTimeString('ddddd.h.nn.ss', '.', '.')) do begin case SuppressibleMsgBox('Encountered an issue while attempting to rename OldInstall folder.', mbError, MB_ABORTRETRYIGNORE, IDIGNORE) of @@ -247,7 +247,7 @@ begin OldInstallPath := AddBackSlash(path) + 'OldInstall' - while DirExists(OldInstallPath) AND NOT AppendCreationTimeToName(OldInstallPath) do + while DirExists(OldInstallPath) AND NOT AppendToName(OldInstallPath, GetDateTimeString('ddddd.h.nn.ss', '.', '.')) do begin case SuppressibleMsgBox(CustomMessage('CannotRenameOld'), mbError, MB_ABORTRETRYIGNORE, IDIGNORE) of IDIGNORE: break; diff --git a/OldInstallHandler.iss b/OldInstallHandler.iss index f92cb83..e588726 100644 --- a/OldInstallHandler.iss +++ b/OldInstallHandler.iss @@ -141,6 +141,7 @@ begin result := true; end; +{ function AppendCreationTimeToName(const Path: String): boolean; var DateTime: String; @@ -162,4 +163,5 @@ begin result := true; end; +} [/Code] \ No newline at end of file