Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improvements #516

Merged
merged 2 commits into from
Dec 22, 2022
Merged

Improvements #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7dd99d
Fix uninstall success translation
panther7 Dec 22, 2022
7b443fd
No need restart app, if Scoop is installed
panther7 Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions wingetui/resources/install_scoop.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
5 changes: 5 additions & 0 deletions wingetui/resources/install_scoop.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion wingetui/storeEngine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down