From 5d4b22ba44eebfdbd8ee64c999527cb604e52cd5 Mon Sep 17 00:00:00 2001 From: crschnick Date: Tue, 10 Feb 2026 04:51:49 +0000 Subject: [PATCH] Pause if repo updates fail --- .../java/io/xpipe/app/update/AppDistributionType.java | 8 +++++++- app/src/main/java/io/xpipe/app/update/AppInstaller.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/update/AppDistributionType.java b/app/src/main/java/io/xpipe/app/update/AppDistributionType.java index 9f834415d..d301a6b95 100644 --- a/app/src/main/java/io/xpipe/app/update/AppDistributionType.java +++ b/app/src/main/java/io/xpipe/app/update/AppDistributionType.java @@ -28,7 +28,10 @@ public enum AppDistributionType implements Translatable { HOMEBREW("homebrew", true, () -> { var pkg = AppNames.ofCurrent().getKebapName(); return new CommandUpdater( - ShellScript.lines("brew upgrade --cask xpipe-io/tap/" + pkg, AppRestart.getTerminalRestartCommand())); + ShellScript.lines( + "brew upgrade --cask xpipe-io/tap/" + pkg, + "if [ \"$?\" != 0 ]; then echo \"Update failed ...\"; read key; fi", + AppRestart.getTerminalRestartCommand())); }), APT_REPO("apt", true, () -> { var pkg = AppNames.ofCurrent().getKebapName(); @@ -36,6 +39,7 @@ public enum AppDistributionType implements Translatable { "echo \"+ sudo apt update && sudo apt install -y " + pkg + "\"", "sudo apt update", "sudo apt install -y " + pkg, + "if [ \"$?\" != 0 ]; then echo \"Update failed ...\"; read key; fi", AppRestart.getTerminalRestartCommand())); }), RPM_REPO("rpm", true, () -> { @@ -43,6 +47,7 @@ public enum AppDistributionType implements Translatable { return new CommandUpdater(ShellScript.lines( "echo \"+ sudo yum upgrade " + pkg + " --refresh -y\"", "sudo yum upgrade " + pkg + " --refresh -y", + "if [ \"$?\" != 0 ]; then echo \"Update failed ...\"; read key; fi", AppRestart.getTerminalRestartCommand())); }), AUR("aur", true, () -> { @@ -50,6 +55,7 @@ public enum AppDistributionType implements Translatable { return new CommandUpdater(ShellScript.lines( "echo \"+ git clone https://aur.archlinux.org/" + pkg + " . && makepkg -si\"", "cd $(mktemp -d) && git clone https://aur.archlinux.org/" + pkg + " . && makepkg -si --noconfirm", + "if [ \"$?\" != 0 ]; then echo \"Update failed ...\"; read key; fi", AppRestart.getTerminalRestartCommand())); }), WEBTOP("webtop", true, () -> new WebtopUpdater()), diff --git a/app/src/main/java/io/xpipe/app/update/AppInstaller.java b/app/src/main/java/io/xpipe/app/update/AppInstaller.java index 0009c236d..6b769d376 100644 --- a/app/src/main/java/io/xpipe/app/update/AppInstaller.java +++ b/app/src/main/java/io/xpipe/app/update/AppInstaller.java @@ -229,7 +229,7 @@ public class AppInstaller { runinstaller if [ "$?" != 0 ]; then echo "Update failed ..." - read -rs -k 1 key + read key fi """, file, file, AppRestart.getTerminalRestartCommand())); AppOperationMode.executeAfterShutdown(() -> {