diff --git a/bin/auto-config-ini/auto-config-ini.exe b/bin/auto-config-ini/auto-config-ini.exe index c283f7e..16b1635 100644 Binary files a/bin/auto-config-ini/auto-config-ini.exe and b/bin/auto-config-ini/auto-config-ini.exe differ diff --git a/bin/auto-config-ini/auto-config-ini.nsi b/bin/auto-config-ini/auto-config-ini.nsi index 8374b00..87e5646 100644 --- a/bin/auto-config-ini/auto-config-ini.nsi +++ b/bin/auto-config-ini/auto-config-ini.nsi @@ -34,7 +34,7 @@ Function .onInit ${If} $UPDATE_FOLDER_PATH == "" MessageBox MB_ICONEXCLAMATION "Missing default params:$\r \ /FOLDER=[updater folder path]$\r \ - /TYPE=[clean|sync]" + /TYPE=[clean|sync|toolkit]" Abort ${EndIf} @@ -64,11 +64,14 @@ Section "" ${If} $CHECK_TYPE == "sync" Call ConfigSectionSync ${GetSectionNames} "$CONFIG_PATH" "ReadSectionSyncCallback" + ${ElseIf} $CHECK_TYPE == "toolkit" + Call ConfigToolkitDefault ${Else} ${GetSectionNames} "$CONFIG_PATH" "ReadSectionCleanCallback" ${EndIf} SectionEnd +; Synchronizes the updater configuration with the one the user had on their machine Function ConfigSectionSync ; sync "disable_clean" from old file to new ReadINIStr $R0 "$OLD_CONFIG_PATH" "UpdaterConfig" "disable_clean" @@ -91,6 +94,14 @@ Function ConfigSectionSync WriteINIStr "$CONFIG_PATH" "UpdaterConfig" "use_github_api" "$R0" FunctionEnd +; Set the default updater configuration within the toolkit +Function ConfigToolkitDefault + ; this is the correct updater configuration for use in the toolkit + WriteINIStr "$CONFIG_PATH" "UpdaterConfig" "disable_clean" "True" + WriteINIStr "$CONFIG_PATH" "UpdaterConfig" "disable_repack" "True" +FunctionEnd + +; Callback to synchronize the state of the tools Function ReadSectionSyncCallback ; analyze all except the updater config and updater self updater ${If} $9 != "UpdaterConfig" @@ -112,6 +123,7 @@ Function ReadSectionSyncCallback Push $0 FunctionEnd +; Callback to eliminate the tools that are not installed in the system Function ReadSectionCleanCallback ; analyze all except the updater config and updater self updater ${If} $9 != "UpdaterConfig" diff --git a/bin/updater/bin/auto-config-ini.exe b/bin/updater/bin/auto-config-ini.exe index c283f7e..16b1635 100644 Binary files a/bin/updater/bin/auto-config-ini.exe and b/bin/updater/bin/auto-config-ini.exe differ diff --git a/bin/updater/scripts/Toolkit-Updater.bat b/bin/updater/scripts/Toolkit-Updater.bat index 2ed43d9..4c1c579 100644 --- a/bin/updater/scripts/Toolkit-Updater.bat +++ b/bin/updater/scripts/Toolkit-Updater.bat @@ -15,6 +15,9 @@ xcopy /Y /C updates\main\toolkit-updater-main\scripts scripts :: Configure installed tools bin\auto-config-ini.exe /FOLDER=..\updater /TYPE=clean +:: Set updater default config +bin\auto-config-ini.exe /FOLDER=..\updater /TYPE=toolkit + :: Sync tools versions bin\auto-config-ini.exe /FOLDER=..\updater /TYPE=sync del tools.ini.old