Merge pull request #516 from panther7/patch-1

Improvements

wingetui/resources/install_scoop.cmd

@@ -3,7 +3,11 @@ SET wingetuipath=%~dp0..\wingetui.exe
 echo This script will install Scoop and the dependencies required by WingetUI.
 pause
 powershell -ExecutionPolicy ByPass -File "%~dp0\install_scoop.ps1"
-echo WingetUI needs to be restarted now. This script is now going to restart WingetUI
-pause
-taskkill /im wingetui.exe /f
-%wingetuipath%
+if %errorlevel% equ 0 (
+    echo WingetUI needs to be restarted now. This script is now going to restart WingetUI
+    pause
+    taskkill /im wingetui.exe /f
+    start /b %wingetuipath%
+) else (
+    pause
+)

wingetui/resources/install_scoop.ps1

@@ -1,3 +1,8 @@
+If (Get-Command scoop -ErrorAction SilentlyContinue) {
+    Write-Output "Scoop is already installed."
+    exit 1
+}
+
 Write-Output "Installing scoop..."
 
 iex "& {$(irm get.scoop.sh)} -RunAsAdmin"

wingetui/storeEngine.py

@@ -510,7 +510,7 @@ def finish(self, returncode: int, output: str = "") -> None:
                     self.cancelButton.setText(_("OK"))
                     self.cancelButton.setIcon(QIcon(realpath+"/resources/tick.png"))
                     self.cancelButton.clicked.connect(self.close)
-                    self.info.setText(f"{self.programName} was uninstalled successfully!")
+                    self.info.setText(_("{0} was {1} successfully!").format(self.programName, self.actionDone))
                     self.progressbar.setValue(1000)
                     self.startCoolDown()
                 else: