diff --git a/VERSION b/VERSION index bcd0f91..80803fa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.8.7 +2.8.8 diff --git a/bin/breezy_gnome_logs b/bin/breezy_gnome_logs deleted file mode 100755 index 52b2ebd..0000000 --- a/bin/breezy_gnome_logs +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -# exit when any command fails -set -e - -if [ "$(id -u)" == "0" ]; then - echo "This script must not be run as root" 1>&2 - exit 1 -fi - -XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}" - -# Create a temp directory to gather logs -tmp_dir=$(mktemp -d -t breezy-gnome-logs-XXXXXXXXXX) -echo "Gathering logs into temp directory: ${tmp_dir}" - -mkdir -p "$tmp_dir/breezy_gnome_logs" - -# Copy gnome logs -if [ -d "$XDG_STATE_HOME/breezy_gnome/logs" ]; then - cp -r "$XDG_STATE_HOME/breezy_gnome/logs" "$tmp_dir/breezy_gnome_logs/breezy_gnome" -else - echo "Warning: Breezy GNOME logs not found at $XDG_STATE_HOME/breezy_gnome/logs" -fi - -# Create archive -archive_name="breezy_gnome_logs_$(date +%Y%m%d_%H%M%S).tar.gz" -tar -czf "$archive_name" -C "$tmp_dir" breezy_gnome_logs -echo "Created log archive: $(pwd)/$archive_name" - -rm -rf "$tmp_dir" diff --git a/bin/package_gnome b/bin/package_gnome index 99321d4..fdc74df 100755 --- a/bin/package_gnome +++ b/bin/package_gnome @@ -53,7 +53,7 @@ fi # copy vulkan setup scripts and configs mkdir -p $PACKAGE_DIR/bin -copy_and_inject_ua "$XR_DRIVER_DIR/bin/ua.sh" "$PACKAGE_DIR/bin" "$GNOME_DIR/bin/setup" "$GNOME_DIR/bin/breezy_gnome_verify" "$GNOME_DIR/bin/breezy_gnome_uninstall" +copy_and_inject_ua "$XR_DRIVER_DIR/bin/ua.sh" "$PACKAGE_DIR/bin" "$GNOME_DIR/bin/setup" "$GNOME_DIR/bin/breezy_gnome_verify" "$GNOME_DIR/bin/breezy_gnome_uninstall" "$GNOME_DIR/bin/breezy_gnome_logs" XR_DRIVER_BINARY_NAME=xrDriver-$ARCH.tar.gz XR_DRIVER_BINARY="$XR_DRIVER_DIR/out/$XR_DRIVER_BINARY_NAME" diff --git a/bin/package_kwin b/bin/package_kwin index 6e07f7b..6fb84b1 100755 --- a/bin/package_kwin +++ b/bin/package_kwin @@ -27,7 +27,7 @@ source $XR_DRIVER_DIR/bin/inject_ua # copy vulkan setup scripts and configs mkdir -p $PACKAGE_DIR/bin -copy_and_inject_ua "$XR_DRIVER_DIR/bin/ua.sh" "$PACKAGE_DIR/bin" "$KWIN_DIR/bin/setup" "$KWIN_DIR/bin/breezy_kwin_uninstall" +copy_and_inject_ua "$XR_DRIVER_DIR/bin/ua.sh" "$PACKAGE_DIR/bin" "$KWIN_DIR/bin/setup" "$KWIN_DIR/bin/breezy_kwin_uninstall" "$KWIN_DIR/bin/breezy_kwin_logs" XR_DRIVER_BINARY_NAME=xrDriver-$ARCH.tar.gz XR_DRIVER_BINARY="$XR_DRIVER_DIR/out/$XR_DRIVER_BINARY_NAME" diff --git a/bin/package_vulkan b/bin/package_vulkan index d3f19a8..2399eee 100755 --- a/bin/package_vulkan +++ b/bin/package_vulkan @@ -39,7 +39,7 @@ fi # copy vulkan setup scripts and configs mkdir -p $PACKAGE_DIR/bin -copy_and_inject_ua "$XR_DRIVER_DIR/bin/ua.sh" "$PACKAGE_DIR/bin" "$VULKAN_DIR/bin/setup" "$VULKAN_DIR/bin/breezy_vulkan_verify" "$VULKAN_DIR/bin/breezy_vulkan_uninstall" +copy_and_inject_ua "$XR_DRIVER_DIR/bin/ua.sh" "$PACKAGE_DIR/bin" "$VULKAN_DIR/bin/setup" "$VULKAN_DIR/bin/breezy_vulkan_verify" "$VULKAN_DIR/bin/breezy_vulkan_uninstall" "$VULKAN_DIR/bin/breezy_vulkan_logs" cp -r $VULKAN_DIR/config $PACKAGE_DIR # build XR driver @@ -79,7 +79,7 @@ cp $XR_DRIVER_DIR/bin/xr_driver_setup $PACKAGE_DIR/bin # include any file that doesn't get modified during setup (e.g. vkBasalt.json files) pushd $PACKAGE_DIR echo $XR_DRIVER_MANIFEST_LINE > manifest -sha256sum bin/breezy_vulkan_uninstall *.frag *.fx* *.png >> manifest +sha256sum bin/breezy_vulkan_uninstall bin/breezy_vulkan_logs *.frag *.fx* *.png >> manifest popd # bundle everything up diff --git a/gnome/bin/breezy_gnome_logs b/gnome/bin/breezy_gnome_logs new file mode 100755 index 0000000..0191616 --- /dev/null +++ b/gnome/bin/breezy_gnome_logs @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +# exit when any command fails +set -e + +if [ "$(id -u)" == "0" ]; then + echo "This script must not be run as root" 1>&2 + exit 1 +fi + +XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}" + +copy_latest_file() { + local src_dir="$1" + local dest_dir="$2" + local description="$3" + + if [ ! -d "$src_dir" ]; then + echo "Warning: ${description} not found at $src_dir" + return 0 + fi + + local latest_file + latest_file=$(find "$src_dir" -type f -printf '%T@ %p\n' 2>/dev/null | sort -nr | head -n 1 | cut -d' ' -f2-) + if [ -z "$latest_file" ]; then + echo "Warning: No files found under $src_dir" + return 0 + fi + + mkdir -p "$dest_dir" + cp "$latest_file" "$dest_dir/" + echo "Copied latest ${description}: $latest_file" +} + +# Create a temp directory to gather logs +tmp_dir=$(mktemp -d -t breezy-gnome-logs-XXXXXXXXXX) +echo "Gathering logs into temp directory: ${tmp_dir}" + +mkdir -p "$tmp_dir/breezy_gnome_logs" + +# Copy the most recent GNOME log file +copy_latest_file "$XDG_STATE_HOME/breezy_gnome/logs/ui" "$tmp_dir/breezy_gnome_logs/breezy_gnome" "Breezy GNOME UI logs" +copy_latest_file "$XDG_STATE_HOME/breezy_gnome/logs/gjs" "$tmp_dir/breezy_gnome_logs/breezy_gnome" "Breezy GNOME GJS logs" + +# Create archive +archive_name="breezy_gnome_logs_$(date +%Y%m%d_%H%M%S).tar.gz" +tar -czf "$archive_name" -C "$tmp_dir" breezy_gnome_logs +echo "Created log archive: $(pwd)/$archive_name" + +rm -rf "$tmp_dir" diff --git a/gnome/bin/breezy_gnome_uninstall b/gnome/bin/breezy_gnome_uninstall index 16d8936..fed3933 100755 --- a/gnome/bin/breezy_gnome_uninstall +++ b/gnome/bin/breezy_gnome_uninstall @@ -56,6 +56,7 @@ fi [ "$for_install" -eq 0 ] && echo "Removing the breezy_gnome scripts from ${XDG_BIN_HOME}" rm -f $XDG_BIN_HOME/breezy_gnome_verify +rm -f $XDG_BIN_HOME/breezy_gnome_logs # this script is self-deleting, leave this as the last command rm -f $XDG_BIN_HOME/breezy_gnome_uninstall \ No newline at end of file diff --git a/gnome/bin/setup b/gnome/bin/setup index e549215..e11fda1 100755 --- a/gnome/bin/setup +++ b/gnome/bin/setup @@ -128,6 +128,7 @@ ESCAPED_GNOME_SHELL_DATA_DIR=$(printf '%s\n' "$GNOME_SHELL_DATA_DIR" | sed -e 's echo "Copying the breezy_gnome scripts to ${XDG_BIN_HOME}" mkdir -p $XDG_BIN_HOME cp bin/breezy_gnome_uninstall $XDG_BIN_HOME +cp bin/breezy_gnome_logs $XDG_BIN_HOME sed -i -e "s/{bin_dir}/$ESCAPED_XDG_BIN_HOME/g" \ -e "s/{data_dir}/$ESCAPED_BREEZY_GNOME_DATA_DIR/g" \ -e "s/{xr_driver_data_dir}/$ESCAPED_XR_DRIVER_DATA_DIR/g" \ diff --git a/bin/breezy_kwin_logs b/kwin/bin/breezy_kwin_logs similarity index 100% rename from bin/breezy_kwin_logs rename to kwin/bin/breezy_kwin_logs diff --git a/kwin/bin/breezy_kwin_uninstall b/kwin/bin/breezy_kwin_uninstall index 3bd4dbe..3fa4691 100755 --- a/kwin/bin/breezy_kwin_uninstall +++ b/kwin/bin/breezy_kwin_uninstall @@ -116,6 +116,8 @@ if [[ -e "$XDG_BIN_HOME/xr_driver_uninstall" && "$for_install" -eq 0 ]]; then sudo "$XDG_BIN_HOME/xr_driver_uninstall" fi +rm -f $XDG_BIN_HOME/breezy_kwin_logs + if [ "$removed_wayland_disable_script" -eq 1 ] && [ "$for_install" -eq 0 ]; then printf "\n\033[1;33m!!! IMPORTANT !!!\033[0m If you enabled Breezy Wayland, you MUST run \033[1;33msteamos-session-select\033[0m from a terminal in order to return to Game Mode.\n" fi diff --git a/kwin/bin/setup b/kwin/bin/setup index a062dd5..6bbb974 100755 --- a/kwin/bin/setup +++ b/kwin/bin/setup @@ -215,6 +215,7 @@ popd > /dev/null mkdir -p $XDG_BIN_HOME cp bin/breezy_kwin_uninstall $XDG_BIN_HOME +cp bin/breezy_kwin_logs $XDG_BIN_HOME install_steamos_shortcuts diff --git a/modules/XRLinuxDriver b/modules/XRLinuxDriver index 906646f..b1e20f8 160000 --- a/modules/XRLinuxDriver +++ b/modules/XRLinuxDriver @@ -1 +1 @@ -Subproject commit 906646fb8502c0e5ea125e1e390ea2f3fa921f81 +Subproject commit b1e20f8a0faf9a603b59bb2281b59af7939bee14 diff --git a/bin/breezy_vulkan_logs b/vulkan/bin/breezy_vulkan_logs similarity index 55% rename from bin/breezy_vulkan_logs rename to vulkan/bin/breezy_vulkan_logs index 07e548c..ef63ed9 100755 --- a/bin/breezy_vulkan_logs +++ b/vulkan/bin/breezy_vulkan_logs @@ -8,18 +8,36 @@ if [ "$(id -u)" == "0" ]; then exit 1 fi +copy_latest_file() { + local src_dir="$1" + local dest_dir="$2" + local description="$3" + + if [ ! -d "$src_dir" ]; then + echo "Warning: ${description} not found at $src_dir" + return 0 + fi + + local latest_file + latest_file=$(find "$src_dir" -type f -printf '%T@ %p\n' 2>/dev/null | sort -nr | head -n 1 | cut -d' ' -f2-) + if [ -z "$latest_file" ]; then + echo "Warning: No files found under $src_dir" + return 0 + fi + + mkdir -p "$dest_dir" + cp "$latest_file" "$dest_dir/" + echo "Copied latest ${description}: $latest_file" +} + # Create a temp directory to gather logs tmp_dir=$(mktemp -d -t breezy-vulkan-logs-XXXXXXXXXX) echo "Gathering logs into temp directory: ${tmp_dir}" mkdir -p "$tmp_dir/breezy_vulkan_logs" -# Copy Decky XRGaming logs -if [ -d "$HOME/homebrew/logs/decky-XRGaming" ]; then - cp -r "$HOME/homebrew/logs/decky-XRGaming" "$tmp_dir/breezy_vulkan_logs/decky-XRGaming" -else - echo "Warning: Decky XRGaming logs not found at $HOME/homebrew/logs/decky-XRGaming" -fi +# Copy the most recent Decky XRGaming log file +copy_latest_file "$HOME/homebrew/logs/decky-XRGaming" "$tmp_dir/breezy_vulkan_logs/decky-XRGaming" "Decky XRGaming logs" # Collect journalctl logs if command -v journalctl &>/dev/null; then diff --git a/vulkan/bin/setup b/vulkan/bin/setup index 069dbaa..6504d83 100755 --- a/vulkan/bin/setup +++ b/vulkan/bin/setup @@ -91,6 +91,7 @@ ESCAPED_XR_DRIVER_DATA_DIR=$(printf '%s\n' "$XR_DRIVER_DATA_DIR" | sed -e 's/[\/ echo "Copying the breezy_vulkan scripts to ${BIN_DIR} and related files to ${DATA_DIR}" cp bin/breezy_vulkan_uninstall $BIN_DIR +cp bin/breezy_vulkan_logs $BIN_DIR sed -i -e "s/{bin_dir}/$ESCAPED_BIN_DIR/g" \ -e "s/{lib_dir}/$ESCAPED_LIB_DIR/g" \ -e "s/{lib32_dir}/$ESCAPED_LIB32_DIR/g" \