mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-10 22:47:02 +01:00
Krzysztof kuhy Rudnicki
4f2b0ccdf7
Two levels of pure taxonomy carrying no information, and a 2-directory
cap leaves no room for them. Categories now sit directly under
linux_configuration/: features, fixes, utils, misc, fresh-install,
installers, diagnostics, gaming, boot_recovery, periodic_background, lib,
meta, tests. A script's own lib/ and tests/ are exempt from the cap, so
those stay put.
Depth violations 248 -> 139; roughly 40 of the remainder are inside
digital_wellbeing and hosts, deferred until the guard-lib repoint.
The moves are the easy half. What breaks is every path that counted
levels, and three classes of it had to be found by resolving paths rather
than reading diffs:
- 52 relative `source` lines for lib/common.sh and lib/android.sh. The
correct prefix differs per file: 40 were ../../ and 12 were ../../../,
so a blanket replace would have fixed one set and broken the other.
- REPO_ROOT in 7 fixes/lib/tests harnesses and setup_syncyomi_guard.sh,
each walking up four levels from a directory now two levels shallower.
This caused a real regression -- the fixes suite went red with
"log_warn: command not found" -- caught by running it and comparing
against the pre-move baseline worktree.
- conftest.py's sys.path entries, which took the pytest gate down with
14 collection errors, and the `# shellcheck source=` directives, which
took shellcheck down with SC1091.
16 symlinks in $HOME broke, including the entire i3blocks bar. All
repointed, and cpu_monitor/memory/disk/time/volume were run to confirm
they emit real output rather than merely resolving.
Verified: 1798 tests pass at 100% coverage, 8 of 9 lib/tests suites pass
(the ninth needs the coverage jail, identically at baseline), pre-commit
is clean, and the two untracked secret configs are still ignored after
their gitignore paths changed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
85 lines
2.6 KiB
Bash
Executable File
85 lines
2.6 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
# Source common library for shared functions
|
|
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
|
|
# shellcheck source=../lib/common.sh
|
|
source "$SCRIPT_DIR/../lib/common.sh"
|
|
|
|
# Configuration -----------------------------------------------------------------
|
|
TARGET_SESSION_NAME="Xfce Session"
|
|
TARGET_PACKAGES=(
|
|
xfwm4 # Compositing window manager with XFCE integration
|
|
xfce4-session # Provides the Xfce session entry for display managers
|
|
xfce4-panel # Panel with system tray support
|
|
xfce4-settings # Settings daemon (enables compositing toggle, theming, etc.)
|
|
xfce4-terminal # Handy default terminal for the new environment
|
|
)
|
|
|
|
# Utility functions --------------------------------------------------------------
|
|
info() { echo "[INFO] $*"; }
|
|
warn() { echo "[WARN] $*" >&2; }
|
|
error() {
|
|
echo "[ERROR] $*" >&2
|
|
exit 1
|
|
}
|
|
|
|
ensure_pacman() {
|
|
require_command pacman "pacman" || error "Required command 'pacman' not found."
|
|
if ! grep -qi "arch" /etc/os-release 2> /dev/null; then
|
|
warn "This script was designed for Arch Linux; continuing anyway."
|
|
fi
|
|
}
|
|
|
|
install_packages() {
|
|
install_missing_pacman_packages "${TARGET_PACKAGES[@]}"
|
|
}
|
|
|
|
print_post_install_tips() {
|
|
cat << EOF
|
|
|
|
------------------------------------------------------------------------
|
|
XFCE session installed.
|
|
|
|
• i3 remains your default window manager. We did not modify ~/.xinitrc,
|
|
display manager defaults, or systemd targets.
|
|
• At your next graphical login, pick "${TARGET_SESSION_NAME}" (or "Xfce"),
|
|
then log in to enjoy compositing via xfwm4.
|
|
• Once you are done testing Unity, simply log out and choose i3 again.
|
|
|
|
We'll log you out now so you can switch sessions safely.
|
|
------------------------------------------------------------------------
|
|
EOF
|
|
}
|
|
|
|
logout_user() {
|
|
local session_id="${XDG_SESSION_ID:-}"
|
|
|
|
if [[ -n $session_id ]] && loginctl show-session "$session_id" > /dev/null 2>&1; then
|
|
info "Terminating current session (ID: $session_id) via loginctl."
|
|
loginctl terminate-session "$session_id"
|
|
return
|
|
fi
|
|
|
|
if loginctl list-sessions 2> /dev/null | awk '{print $1" "$3}' | grep -q " $USER$"; then
|
|
info "Terminating all sessions for user '$USER' via loginctl."
|
|
loginctl terminate-user "$USER"
|
|
return
|
|
fi
|
|
|
|
warn "loginctl could not terminate the session; attempting fallback logout."
|
|
pkill -KILL -u "$USER" || error "Failed to terminate user sessions. Please log out manually."
|
|
}
|
|
|
|
main() {
|
|
ensure_pacman
|
|
install_packages
|
|
print_post_install_tips
|
|
|
|
# Give the user a moment to read the instructions before logging out.
|
|
logout_user
|
|
}
|
|
|
|
main "$@"
|