Merge pull request #86 from JaKooLit/ags-fix

Ags fix - Ported from ubuntu/debian fixes

Author: dwilliam62

WARP.md

@@ -0,0 +1,77 @@
+# WARP.md
+
+This file provides guidance to WARP (warp.dev) when working with code in this repository.
+
+## Essential commands
+
+- Install (interactive)
+  - chmod +x install.sh && ./install.sh
+- Install with a preset file
+  - ./install.sh --preset presets/my-desktop.preset
+  - Example preset (ON/OFF strings are read via `source`):
+    ```bash
+    gtk_themes="ON"
+    bluetooth="OFF"
+    thunar="ON"
+    ags="ON"
+    sddm="OFF"
+    sddm_theme="OFF"
+    xdph="ON"
+    zsh="ON"
+    pokemon="OFF"
+    rog="OFF"
+    dots="ON"
+    input_group="OFF"
+    nvidia="OFF"
+    ```
+- Re-run a specific module (from repo root; do not cd into install-scripts)
+  - ./install-scripts/<script-name>.sh
+  - Examples: ./install-scripts/gtk_themes.sh, ./install-scripts/sddm.sh, ./install-scripts/04-Final-Check.sh
+- Auto installer (local wrapper)
+  - ./auto-install.sh
+- Uninstall (guided)
+  - chmod +x uninstall.sh && ./uninstall.sh
+- Logs
+  - All runs write timestamped logs to Install-Logs/
+  - Tail last log: ls -t Install-Logs | head -n1 | xargs -I{} tail -n 200 -f Install-Logs/{}
+
+Notes from README that affect usage
+- Do not run as root; run from a directory where you have write permissions (e.g., your home).
+- If a login manager like GDM/LightDM is active, SDDM install options will be disabled until you stop/disable them and reboot.
+- On NVIDIA systems, the script can configure the G06 driver when you select the NVIDIA option.
+- In VMs, enable 3D acceleration or Hyprland may not start.
+
+## High-level architecture
+
+This repo is a modular Bash installer for Hyprland on openSUSE Tumbleweed. There is no build or test suite; development involves editing shell modules and running them.
+
+- Entry point: install.sh
+  - Guards: not-root, ensures `whiptail`/`pciutils` exist, logs to Install-Logs/.
+  - Interactive flow (whiptail) selects features; supports `--preset <file>` by sourcing ON/OFF flags.
+  - Environment detection: active login managers (disables SDDM path), NVIDIA GPU prompt.
+  - Orchestration order (core): adds Packman repo → installs base deps → fonts → Hyprland core → ecosystem → forced installs → OBS/opi pkgs → wallust → optional selections → final cleanup → final package check.
+  - Executes modules via a helper that keeps paths and executability consistent.
+
+- Module library: install-scripts/
+  - Global_functions.sh: shared helpers used by all modules
+    - zypper/opi install variants (normal, no-recommends, force, auto-agree), cargo install, package removal
+    - progress spinner, colorized output, central logging
+  - Core modules (representative)
+    - 00-add-repo.sh (Packman), 01-dependencies.sh (patterns + opi), hyprland.sh (Hyprland packages)
+    - 02-hypr-pkgs.sh (main and secondary desktop packages, no-recommends list, uninstall conflicts), 03-opi-pkgs.sh (OBS via `opi`)
+    - force-install.sh (reinstall edge cases), 04-Final-Check.sh (verifies essential packages and /usr/local tools)
+  - Optional feature modules (selected in install.sh)
+    - Examples: sddm.sh and sddm_theme.sh, gtk_themes.sh, xdph.sh (xdg-desktop-portal-hyprland), bluetooth.sh, thunar.sh (+ thunar_default.sh), ags.sh (builds AGS v1.9.0 via git/npm/meson and installs wrapper in /usr/local/bin), nvidia.sh, rog.sh, dotfiles-main.sh, wallust.sh, InputGroup.sh, zsh.sh, zsh_pokemon.sh
+
+- Automation/maintenance
+  - auto-install.sh: clone-or-update then run install.sh
+  - uninstall.sh: interactive package and config removal (zypper removes, deletes ~/.config/* selections)
+
+## Repository documents considered
+
+- README.md: usage, prerequisites, uninstall availability, and operational caveats (NVIDIA, SDDM, VM acceleration, re-running modules from repo root).
+- CONTRIBUTING.md and .github/PULL_REQUEST_TEMPLATE.md: contribution flow; no repo-defined lint/typecheck/test commands.
+
+## What’s not here
+
+- No configured linter, formatter, or test suite in this repo. If you need linting, run your preferred shell tools locally (e.g., shellcheck, shfmt) but there are no project scripts for them.

install-scripts/ags.sh

@@ -3,6 +3,7 @@
 # Aylur's GTK Shell v 1.9.0 #
 # for desktop overview
 
+set -euo pipefail
 
 ags=(
     typescript 
@@ -16,6 +17,13 @@ ags=(
     NetworkManager 
     libdbusmenu-gtk3-4
     libpulse-devel 
+    gobject-introspection
+    gobject-introspection-devel
+)
+
+# Packages to force re-install (if needed)
+f_ags=(
+    npm
 )
 
 # specific tags to download
@@ -38,34 +46,57 @@ fi
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_ags.log"
 MLOG="install-$(date +%d-%H%M%S)_ags2.log"
 
-# Check if AGS is installed
-if command -v ags &>/dev/null; then
-    AGS_VERSION=$(ags -v | awk '{print $NF}') 
+# Check if AGS is installed (only if main ESM exists to avoid wrapper error)
+AGS_ESM=""
+if [ -f "/usr/local/share/com.github.Aylur.ags/com.github.Aylur.ags" ]; then
+  AGS_ESM="/usr/local/share/com.github.Aylur.ags/com.github.Aylur.ags"
+elif [ -f "/usr/share/com.github.Aylur.ags/com.github.Aylur.ags" ]; then
+  AGS_ESM="/usr/share/com.github.Aylur.ags/com.github.Aylur.ags"
+fi
+
+if command -v ags &>/dev/null && [ -n "$AGS_ESM" ]; then
+    AGS_VERSION=$(ags -v | awk '{print $NF}')
     if [[ "$AGS_VERSION" == "1.9.0" ]]; then
-        printf "${INFO} ${MAGENTA}Aylur's GTK Shell v1.9.0${RESET} is already installed. Skipping installation."
-        printf "\n%.0s" {1..2}
-        exit 0
+        printf "${INFO} ${MAGENTA}Aylur's GTK Shell v1.9.0${RESET} is already installed.\n"
+        read -r -p "Reinstall v1.9.0 anyway? [y/N]: " REPLY
+        case "$REPLY" in
+          [yY]|[yY][eE][sS])
+            printf "${NOTE} Reinstalling Aylur's GTK Shell v1.9.0...\n"
+            ;;
+          *)
+            printf "Skipping reinstallation.\n"
+            printf "\n%.0s" {1..2}
+            exit 0
+            ;;
+        esac
     fi
 fi
 
 # Installation of main components
-printf "\n%s - Installing ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET} Dependencies \n" "${NOTE}"
+printf "\n%s - Installing ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET} Dependencies \n" "${INFO}"
 
 # Installing ags Dependencies
 for PKG1 in "${ags[@]}"; do
     install_package "$PKG1" "$LOG"
 done
 
+# Force reinstall select packages if requested
+for force_ags in "${f_ags[@]}"; do
+   install_package_force "$force_ags" 2>&1 | tee -a "$LOG"
+done
+
 printf "\n%.0s" {1..1}
 
 # ags v1
 printf "${NOTE} Install and Compiling ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET}..\n"
 
-# Check if directory exists and remove it
-if [ -d "ags" ]; then
-    printf "${NOTE} Removing existing ags directory...\n"
-    rm -rf "ags"
-fi
+# Remove previous sources (both legacy "ags" and tagged "ags_v1.9.0")
+for SRC_DIR in "ags" "ags_v1.9.0"; do
+    if [ -d "$SRC_DIR" ]; then
+        printf "${NOTE} Removing existing %s directory...\n" "$SRC_DIR"
+        rm -rf "$SRC_DIR"
+    fi
+done
 
 printf "\n%.0s" {1..1}
 printf "${INFO} Kindly Standby...cloning and compiling ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET}...\n"
@@ -76,7 +107,94 @@ if git clone --depth=1 https://github.com/JaKooLit/ags_v1.9.0.git; then
     npm install
     meson setup build
    if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then
+    : # with pipefail set, this reflects meson install status
     printf "\n${OK} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
+
+    # Patch installed AGS launchers to ensure GI typelibs in /usr/local/lib are discoverable in GJS ESM
+    printf "${NOTE} Applying AGS launcher patch for GI typelibs search path...\n"
+
+    patch_ags_launcher() {
+      local target="$1"
+      if ! sudo test -f "$target"; then
+        return 1
+      fi
+
+      # 1) Remove deprecated GIR Repository path tweaks and GIRepository import (harmless if absent)
+      sudo sed -i \
+        -e '/Repository\.prepend_search_path/d' \
+        -e '/Repository\.prepend_library_path/d' \
+        -e '/gi:\/\/GIRepository/d' \
+        "$target"
+
+      # 2) Ensure GLib import exists (insert after first import line, or at top if none)
+      if ! sudo grep -q '^import GLib from "gi://GLib";' "$target"; then
+        TMPF=$(sudo mktemp)
+        sudo awk 'BEGIN{added=0} {
+          if (!added && $0 ~ /^import /) { print; print "import GLib from \"gi://GLib\";"; added=1; next }
+          print
+        } END { if (!added) print "import GLib from \"gi://GLib\";" }' "$target" | sudo tee "$TMPF" >/dev/null
+        sudo mv "$TMPF" "$target"
+      fi
+
+      # 3) Inject GI_TYPELIB_PATH export right after the GLib import (once)
+      if ! sudo grep -q 'GLib.setenv("GI_TYPELIB_PATH"' "$target"; then
+        TMPF=$(sudo mktemp)
+        sudo awk '{print} $0 ~ /^import GLib from "gi:\/\/GLib";$/ {print "const __old = GLib.getenv(\"GI_TYPELIB_PATH\");"; print "GLib.setenv(\"GI_TYPELIB_PATH\", \"/usr/local/lib64:/usr/local/lib:/usr/local/lib64/girepository-1.0:/usr/local/lib/girepository-1.0:/usr/lib64/girepository-1.0:/usr/lib/girepository-1.0:/usr/lib64/ags:/usr/local/lib/ags\" + (__old ? \":\" + __old : \"\"), true);"; print "const __oldld = GLib.getenv(\"LD_LIBRARY_PATH\");"; print "GLib.setenv(\"LD_LIBRARY_PATH\", \"/usr/local/lib64:/usr/local/lib\" + (__oldld ? \":\" + __oldld : \"\"), true);"}' "$target" | sudo tee "$TMPF" >/dev/null
+        sudo mv "$TMPF" "$target"
+      fi
+
+      # 4) Ensure LD_LIBRARY_PATH export exists even if GI_TYPELIB_PATH was already present
+      if ! sudo grep -q 'GLib.setenv("LD_LIBRARY_PATH"' "$target"; then
+        TMPF=$(sudo mktemp)
+        sudo awk '{print} $0 ~ /^import GLib from "gi:\/\/GLib";$/ {print "const __oldld = GLib.getenv(\"LD_LIBRARY_PATH\");"; print "GLib.setenv(\"LD_LIBRARY_PATH\", \"/usr/local/lib64:/usr/local/lib\" + (__oldld ? \":\" + __oldld : \"\"), true);"}' "$target" | sudo tee "$TMPF" >/dev/null
+        sudo mv "$TMPF" "$target"
+      fi
+
+      # Restore executable bit for bin wrappers (mv from mktemp resets mode to 0600)
+      case "$target" in
+        */bin/ags)
+          sudo chmod 0755 "$target" || true
+          ;;
+      esac
+
+      printf "${OK} Patched: %s\n" "$target"
+      return 0
+    }
+
+    # Try common locations
+    for CAND in \
+      "/usr/local/share/com.github.Aylur.ags/com.github.Aylur.ags" \
+      "/usr/share/com.github.Aylur.ags/com.github.Aylur.ags" \
+      "/usr/local/bin/ags" \
+      "/usr/bin/ags"; do
+      patch_ags_launcher "$CAND" || true
+    done
+
+    # Create an env-setting wrapper for AGS to ensure GI typelibs/libs are discoverable
+    printf "${NOTE} Creating env wrapper /usr/local/bin/ags...\n"
+    sudo tee /usr/local/bin/ags >/dev/null <<'WRAP'
+#!/usr/bin/env bash
+set -euo pipefail
+cd "$HOME" 2>/dev/null || true
+# Locate AGS ESM entry
+MAIN_JS="/usr/local/share/com.github.Aylur.ags/com.github.Aylur.ags"
+if [ ! -f "$MAIN_JS" ]; then
+  MAIN_JS="/usr/share/com.github.Aylur.ags/com.github.Aylur.ags"
+fi
+if [ ! -f "$MAIN_JS" ]; then
+  echo "Unable to find AGS entry script (com.github.Aylur.ags) in /usr/local/share or /usr/share" >&2
+  exit 1
+fi
+# Ensure GI typelibs and native libs are discoverable before gjs ESM loads
+export GI_TYPELIB_PATH="/usr/local/lib64:/usr/local/lib:/usr/local/lib64/girepository-1.0:/usr/local/lib/girepository-1.0:/usr/lib64/girepository-1.0:/usr/lib/girepository-1.0:/usr/lib64/ags:/usr/local/lib/ags:${GI_TYPELIB_PATH-}"
+export LD_LIBRARY_PATH="/usr/local/lib64:/usr/local/lib:${LD_LIBRARY_PATH-}"
+exec /usr/bin/gjs -m "$MAIN_JS" "$@"
+WRAP
+    sudo chmod 0755 /usr/local/bin/ags
+    # Ensure ESM entry is readable by gjs
+    sudo chmod 0644 /usr/local/share/com.github.Aylur.ags/com.github.Aylur.ags 2>/dev/null || true
+    sudo chmod 0644 /usr/share/com.github.Aylur.ags/com.github.Aylur.ags 2>/dev/null || true
+    printf "${OK} AGS wrapper installed at /usr/local/bin/ags\n"
   else
     echo -e "\n${ERROR} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Installation failed\n " 2>&1 | tee -a "$MLOG"
    fi
@@ -89,4 +207,4 @@ else
     exit 1
 fi
 
-printf "\n%.0s" {1..2}
+printf "\n%.0s" {1..2}