From f8f434457b5d8675c8d15d4a16a5395986620b28 Mon Sep 17 00:00:00 2001 From: ohaiibuzzle <23693150+ohaiibuzzle@users.noreply.github.com> Date: Sun, 2 Jul 2023 00:43:33 +0700 Subject: [PATCH] fix: show prompt after uninstalling --- Harbor/Localizable.xcstrings | 24 +++--------------------- Harbor/Systems/GPKUtils.swift | 3 ++- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/Harbor/Localizable.xcstrings b/Harbor/Localizable.xcstrings index 706984b..3083c75 100644 --- a/Harbor/Localizable.xcstrings +++ b/Harbor/Localizable.xcstrings @@ -511,17 +511,6 @@ } } }, - "menu.harbor.reinstallGPTK" : { - "extractionState" : "stale", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Reinstall GPTK" - } - } - } - }, "setup.btn.installGPK" : { "localizations" : { "en" : { @@ -602,19 +591,12 @@ } } }, - "setup.message.enterPassword" : { - "extractionState" : "stale", + "setup.message.removalComplete" : { "localizations" : { "en" : { "stringUnit" : { "state" : "translated", - "value" : "Please enter your admin password in order to un-quarantine the newly installed bottle" - } - }, - "pl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Wpisz hasło Administratora, aby usunąć kwarantannę z nowo zainstalowanej butelki" + "value" : "Game Porting Toolkit removal complete. You can now close this window" } } } @@ -1529,4 +1511,4 @@ } }, "version" : "1.0" -} +} \ No newline at end of file diff --git a/Harbor/Systems/GPKUtils.swift b/Harbor/Systems/GPKUtils.swift index c83ce06..3a0d30b 100644 --- a/Harbor/Systems/GPKUtils.swift +++ b/Harbor/Systems/GPKUtils.swift @@ -239,7 +239,8 @@ final class GPKUtils { func completelyRemoveGPK() { // Remove the GPK bottle from Brew let aaplScript = """ - property shellScript : "/usr/local/Homebrew/bin/brew uninstall game-porting-toolkit" + property shellScript : "/usr/local/Homebrew/bin/brew uninstall game-porting-toolkit && \ + echo '\(String(localized: "setup.message.removalComplete"))' && exit" tell application "Terminal" activate