maik/Arch-Hyprland
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed AGS v1

Browse Source 
It now does the following:
◦  Clone upstream AGS 1.9.0.
◦  Stub out PAM/GUtils via pam.ts.
◦  Build and install AGS.
◦  Install the known-good launcher from install-scripts/ags.launcher.com.github.Aylur.ags.
◦  Point /usr/local/bin/ags at that launcher.

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   install-scripts/ags.sh
This commit is contained in:
Don Williams
2025-11-14 02:09:16 -05:00
parent 23f52b3f00
commit 47f4e4d7b6
1 changed files with 29 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
install-scripts/ags.sh
View File

@@ -95,16 +95,25 @@ if git clone --depth=1 https://github.com/JaKooLit/ags_v1.9.0.git; then
grep -n 'moduleResolution\|ignoreDeprecations' tsconfig.json >> "$MLOG" || true grep -n 'moduleResolution\|ignoreDeprecations' tsconfig.json >> "$MLOG" || true
fi fi
# Patch pam.ts to avoid ESM gi://GUtils (which breaks on some GJS builds) # Replace pam.ts with a stub that does NOT depend on GUtils at all.
# and instead use imports.gi.GUtils, which we know works from runtime tests. # The desktop overview does not use PAM, and GUtils typelib support is
# inconsistent across distros, so we disable these helpers instead of
# crashing at startup when the typelib is missing.
if [ -f src/utils/pam.ts ]; then if [ -f src/utils/pam.ts ]; then
if grep -q "import GUtils from 'gi://GUtils'" src/utils/pam.ts; then printf "%s Replacing src/utils/pam.ts with PAM stub (no GUtils dependency)...\\n" "${NOTE}" | tee -a "$MLOG"
printf "%s Patching src/utils/pam.ts to use imports.gi.GUtils...\n" "${NOTE}" | tee -a "$MLOG" cat > src/utils/pam.ts <<'PAM_STUB'
# 1) Drop the upstream // @ts-expect-error line (it causes TS2578 now). // Stubbed PAM auth for AGS installed via Arch-Hyprland.
sed -i '/@ts-expect-error/d' src/utils/pam.ts // The desktop overview does not use PAM, and GUtils typelib support
# 2) Replace the gi:// import with an imports.gi-based binding. // is unreliable across distros, so we disable these helpers here.
sed -i "s|import GUtils from 'gi://GUtils';|// Patched by install-scripts/ags.sh to avoid gi://GUtils ESM issues\\n// eslint-disable-next-line @typescript-eslint/ban-ts-comment\\n// @ts-ignore\\ndeclare const imports: any;\\nconst GUtils = (imports as any).gi.GUtils as any;|" src/utils/pam.ts
fi export function authenticate(password: string): Promise<number> {
return Promise.reject(new Error("PAM authentication disabled on this system (no GUtils)"));
}
export function authenticateUser(username: string, password: string): Promise<number> {
return Promise.reject(new Error("PAM authentication disabled on this system (no GUtils)"));
}
PAM_STUB
fi fi
npm install npm install
@@ -124,56 +133,19 @@ if git clone --depth=1 https://github.com/JaKooLit/ags_v1.9.0.git; then
LAUNCHER_PATH="$LAUNCHER_DIR/com.github.Aylur.ags" LAUNCHER_PATH="$LAUNCHER_DIR/com.github.Aylur.ags"
sudo mkdir -p "$LAUNCHER_DIR" sudo mkdir -p "$LAUNCHER_DIR"
# Install a known-good launcher that sets GI_TYPELIB_PATH so GUtils and other # Install the known-good launcher we captured from a working system.
# typelibs can be found, matching the working setup on jak-cachy. # This JS entry script uses GLib to set GI_TYPELIB_PATH and does not
sudo tee "$LAUNCHER_PATH" >/dev/null <<'EOF' # depend on GIRepository, which avoids missing-typelib crashes.
#!/usr/sbin/gjs -m LAUNCHER_SRC="$SCRIPT_DIR/ags.launcher.com.github.Aylur.ags"
if [ -f "$LAUNCHER_SRC" ]; then
sudo install -m 755 "$LAUNCHER_SRC" "$LAUNCHER_PATH"
else
printf "${WARN} Saved launcher not found at %s; leaving Meson-installed launcher untouched.\\n" "$LAUNCHER_SRC" | tee -a "$MLOG"
fi
import { exit, programArgs, programInvocationName } from "system"; # Ensure /usr/local/bin/ags points to the JS entry script.
import GLib from "gi://GLib";
GLib.setenv("GI_TYPELIB_PATH", "/usr/local/lib:/usr/lib/girepository-1.0", true);
imports.package.init({
name: "com.github.Aylur.ags",
version: "1.9.0",
prefix: "/usr/local",
libdir: "/usr/local/lib",
});
const module = await import("resource:///com/github/Aylur/ags/main.js");
const exitCode = await module.main([programInvocationName, ...programArgs]);
exit(exitCode);
EOF
# Also install a convenience launcher in /usr/local/bin/ags as a shell wrapper
# so GI_TYPELIB_PATH is set *before* gjs and GIRepository are initialized.
sudo mkdir -p /usr/local/bin sudo mkdir -p /usr/local/bin
sudo tee /usr/local/bin/ags >/dev/null <<'EOF' sudo ln -srf "$LAUNCHER_PATH" /usr/local/bin/ags
#!/usr/bin/env bash
set -euo pipefail
# Start from user's home for configs that expect $HOME.
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/lib/x86_64-linux-gnu/girepository-1.0:/usr/lib/girepository-1.0:/usr/lib64/girepository-1.0:/usr/lib64/ags:${GI_TYPELIB_PATH-}"
export LD_LIBRARY_PATH="/usr/local/lib64:/usr/local/lib:${LD_LIBRARY_PATH-}"
exec /usr/bin/gjs -m "$MAIN_JS" -- "$@"
EOF
sudo chmod +x /usr/local/bin/ags
printf "${OK} AGS launcher installed.\\n" printf "${OK} AGS launcher installed.\\n"
# Move logs to Install-Logs directory # Move logs to Install-Logs directory
mv "$MLOG" ../Install-Logs/ || true mv "$MLOG" ../Install-Logs/ || true