From 2bc508d4489869aa3bbd99b197184290b278a0a6 Mon Sep 17 00:00:00 2001 From: crschnick Date: Mon, 1 Jan 2024 10:03:49 +0000 Subject: [PATCH] Small linux fixes --- app/src/main/java/io/xpipe/app/core/check/AppFontCheck.java | 2 +- .../main/java/io/xpipe/app/issue/TerminalErrorHandler.java | 2 ++ get-xpipe.sh | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/core/check/AppFontCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppFontCheck.java index c771d228..66344f4c 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppFontCheck.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppFontCheck.java @@ -8,7 +8,7 @@ public class AppFontCheck { try { Font.getDefault(); } catch (Throwable t) { - throw new IllegalStateException("Unable to load any fonts. Check whether your system is properly configured with fontconfig", t); + throw new IllegalStateException("Unable to load any fonts. Check whether your system is properly configured with fontconfig and you have any fonts installed", t); } } diff --git a/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java b/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java index 8f164247..f751db70 100644 --- a/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java +++ b/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java @@ -26,6 +26,8 @@ public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHa handleWithSecondaryException(event, throwable); ErrorAction.ignore().handle(event); })) { + // Exit if we couldn't initialize the GUI + OperationMode.halt(1); return; } diff --git a/get-xpipe.sh b/get-xpipe.sh index 9c46a004..62645bd0 100644 --- a/get-xpipe.sh +++ b/get-xpipe.sh @@ -127,8 +127,10 @@ install() { case "$uname_str" in Linux) if [ -f "/etc/debian_version" ]; then - DEBIAN_FRONTEND=noninteractive sudo apt-get install -qy "$file" + info "Installing file $file with apt" + DEBIAN_FRONTEND=noninteractive sudo apt install -qy "$file" else + info "Installing file $file with rpm" sudo rpm -i "$file" fi ;;