From e6e7602a29535706321aef7511b5c8d6b8c8d3fc Mon Sep 17 00:00:00 2001 From: wheaney <42350981+wheaney@users.noreply.github.com> Date: Fri, 14 Mar 2025 10:16:43 -0700 Subject: [PATCH] Add environment variable for skipping setup warning, v2.0.14 --- VERSION | 2 +- gnome/bin/setup | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 476ede4..3d45b5c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.13 \ No newline at end of file +2.0.14 diff --git a/gnome/bin/setup b/gnome/bin/setup index fbdf270..dbaac12 100755 --- a/gnome/bin/setup +++ b/gnome/bin/setup @@ -22,11 +22,19 @@ check_command "python" "python3" PYTHON_GI_CHECK="import gi; gi.require_version('Gtk', '4.0'); gi.require_version('Adw', '1'); gi.require_version('Gio', '2.0'); gi.require_version('GLib', '2.0'); gi.require_version('GObject', '2.0'); gi.require_version('Gst', '1.0'); from gi.repository import Gtk, Adw, Gio, GLib, GObject, Gst" if ! { python3 -c "$PYTHON_GI_CHECK" 2>/dev/null || python -c "$PYTHON_GI_CHECK" 2>/dev/null; }; then - echo "Please install the required GTK4, libadwaita, and GStreamer libraries:" - echo "For Debian/Ubuntu: sudo apt install python3-gi gir1.2-gtk-4.0 libadwaita-1-0 gir1.2-adw-1 gir1.2-glib-2.0 gir1.2-gobject-2.0 gir1.2-gstreamer-1.0" - echo "For Fedora: sudo dnf install python3-gobject gtk4 libadwaita gstreamer1-python" - echo "For Arch Linux: sudo pacman -S python-gobject gtk4 libadwaita gst-python" - exit 1 + printf "\033[1;31mERROR:\033[0m Python GObject libraries are missing\n" + printf "Please install the required Python GObject dependencies: GTK4, libadwaita, and GStreamer libraries:\n" + printf "If you're using a Python installation from a package manager, you may need to install the following packages:\n" + printf "\tFor Debian/Ubuntu: sudo apt install python3-gi gir1.2-gtk-4.0 libadwaita-1-0 gir1.2-adw-1 gir1.2-glib-2.0 gir1.2-gobject-2.0 gir1.2-gstreamer-1.0\n" + printf "\tFor Fedora: sudo dnf install python3-gobject python3-gstreamer1 gtk4 libadwaita\n" + printf "\tFor Arch Linux: sudo pacman -S python-gobject gst-python gtk4 libadwaita\n" + printf "\nIf you continue to have issues, rerun the setup with BREEZY_IGNORE_PYTHON_ERRORS=1 to skip this check.\n\n" + if [ -z "$BREEZY_IGNORE_PYTHON_ERRORS" ]; then + exit 1 + else + printf "\033[1;33mWARNING:\033[0m Ignoring Python dependency failures. " + printf "Be aware that the Breezy Desktop UI application may fail to launch.\n\n" + fi fi if [ "$XDG_SESSION_TYPE" != "wayland" ]; then