mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-13 06:10:48 +01:00
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
185 lines
5.5 KiB
Bash
Executable File
185 lines
5.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Xorg, GCC-workaround and pyroveil configuration for nvidia_troubleshoot.sh.
|
|
#
|
|
# Sourced by the entry script, which owns the ordering; this file defines
|
|
# functions only, so sourcing it has no side effects.
|
|
|
|
# Function to backup file if it exists
|
|
backup_file() {
|
|
local file="$1"
|
|
if [[ -f $file ]]; then
|
|
cp "$file" "$file.backup.$(date +%Y%m%d_%H%M%S)"
|
|
echo "✓ Backed up $file"
|
|
fi
|
|
}
|
|
|
|
# Function to add or update xorg.conf for RenderAccel
|
|
configure_xorg() {
|
|
echo ""
|
|
echo "2. Configuring Xorg Settings..."
|
|
echo "==============================="
|
|
|
|
# These paths default to the real locations and are overridden only by
|
|
# the test harness. They are plain globals ASSIGNED here rather than read
|
|
# from the environment, so the default has to live at the assignment --
|
|
# an exported value alone would be overwritten on entry.
|
|
XORG_CONF="${XORG_CONF:-/etc/X11/xorg.conf}"
|
|
XORG_CONF_D="${XORG_CONF_D:-/etc/X11/xorg.conf.d}"
|
|
NVIDIA_CONF="$XORG_CONF_D/20-nvidia.conf"
|
|
|
|
# Create xorg.conf.d directory if it doesn't exist
|
|
mkdir -p "$XORG_CONF_D"
|
|
|
|
# Backup existing xorg.conf if it exists
|
|
backup_file "$XORG_CONF"
|
|
backup_file "$NVIDIA_CONF"
|
|
|
|
# Create NVIDIA-specific configuration
|
|
# NOTE: RenderAccel must be "true" (or omitted, since it defaults to true).
|
|
# Setting it to "false" forces software rendering, causing Xorg to consume
|
|
# 30%+ CPU on the desktop and making the system feel extremely sluggish.
|
|
cat >"$NVIDIA_CONF" <<EOF
|
|
# NVIDIA configuration - hardware acceleration enabled
|
|
# Created by nvidia_troubleshoot.sh on $(date)
|
|
Section "Device"
|
|
Identifier "NVIDIA Card"
|
|
Driver "nvidia"
|
|
Option "RenderAccel" "true"
|
|
EndSection
|
|
EOF
|
|
|
|
echo "✓ Created $NVIDIA_CONF with RenderAccel enabled"
|
|
}
|
|
|
|
# Function to add GCC mismatch workaround
|
|
configure_gcc_workaround() {
|
|
echo ""
|
|
echo "3. Configuring GCC Mismatch Workaround..."
|
|
echo "=========================================="
|
|
|
|
local PROFILE_FILE="${PROFILE_FILE:-/etc/profile}"
|
|
local timestamp
|
|
timestamp=$(date)
|
|
backup_file "$PROFILE_FILE"
|
|
|
|
# Check if IGNORE_CC_MISMATCH is already set
|
|
if ! grep -q "IGNORE_CC_MISMATCH" "$PROFILE_FILE"; then
|
|
{
|
|
printf '\n'
|
|
printf '# NVIDIA GCC version mismatch workaround\n'
|
|
printf '# Added by nvidia_troubleshoot.sh on %s\n' "$timestamp"
|
|
printf 'export IGNORE_CC_MISMATCH=1\n'
|
|
} >>"$PROFILE_FILE"
|
|
echo "✓ Added IGNORE_CC_MISMATCH=1 to $PROFILE_FILE"
|
|
else
|
|
echo "✓ IGNORE_CC_MISMATCH already configured in $PROFILE_FILE"
|
|
fi
|
|
}
|
|
|
|
# Function to install pyroveil for mesh shader issues
|
|
install_pyroveil() {
|
|
echo ""
|
|
echo "4. Pyroveil Setup for Mesh Shader Issues..."
|
|
echo "==========================================="
|
|
|
|
local user_home="${USER_HOME:-/home/$SUDO_USER}"
|
|
local pyroveil_dir="$user_home/pyroveil"
|
|
|
|
echo "Mesh shaders have poor support on NVIDIA drivers, causing issues in games"
|
|
echo "like Final Fantasy VII Rebirth. Pyroveil can work around these problems."
|
|
echo ""
|
|
|
|
local install_pyroveil=true
|
|
|
|
if [[ $INTERACTIVE_MODE == "true" ]]; then
|
|
read -p "Would you like to install Pyroveil? (y/N): " -n 1 -r
|
|
echo
|
|
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
|
install_pyroveil=false
|
|
fi
|
|
else
|
|
echo "Auto-installing Pyroveil (use --interactive to prompt)"
|
|
fi
|
|
|
|
if [[ $install_pyroveil == "true" ]]; then
|
|
# Check for required dependencies
|
|
local missing_deps=()
|
|
|
|
for dep in git cmake ninja gcc; do
|
|
if ! command -v "$dep" &>/dev/null; then
|
|
missing_deps+=("$dep")
|
|
fi
|
|
done
|
|
|
|
if [[ ${#missing_deps[@]} -gt 0 ]]; then
|
|
echo "Missing dependencies: ${missing_deps[*]}"
|
|
echo "Please install them first. On Arch Linux:"
|
|
echo "pacman -S base-devel git cmake ninja"
|
|
return 1
|
|
fi
|
|
|
|
# Clone and build pyroveil as the original user
|
|
echo "Installing Pyroveil to $pyroveil_dir..."
|
|
|
|
if [[ -d $pyroveil_dir ]]; then
|
|
echo "Pyroveil directory already exists. Updating..."
|
|
sudo -u "$SUDO_USER" bash -c "cd '$pyroveil_dir' && git pull"
|
|
else
|
|
sudo -u "$SUDO_USER" git clone https://github.com/HansKristian-Work/pyroveil.git "$pyroveil_dir"
|
|
fi
|
|
|
|
sudo -u "$SUDO_USER" bash -c "
|
|
cd '$pyroveil_dir'
|
|
git submodule update --init
|
|
cmake . -Bbuild -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$user_home/.local
|
|
ninja -C build install
|
|
"
|
|
|
|
echo "✓ Pyroveil installed successfully"
|
|
echo ""
|
|
echo "To use Pyroveil with games that have mesh shader issues:"
|
|
echo "1. For Final Fantasy VII Rebirth:"
|
|
echo " PYROVEIL=1 PYROVEIL_CONFIG=$pyroveil_dir/hacks/ffvii-rebirth-nvidia/pyroveil.json %command%"
|
|
echo ""
|
|
echo "2. For Steam games, add to launch options:"
|
|
echo " PYROVEIL=1 PYROVEIL_CONFIG=/path/to/config/pyroveil.json %command%"
|
|
echo ""
|
|
echo "Available configs in: $pyroveil_dir/hacks/"
|
|
|
|
# Create a helper script
|
|
cat >"$user_home/run-with-pyroveil.sh" <<EOF
|
|
#!/bin/bash
|
|
# Helper script to run games with Pyroveil
|
|
# Usage: ./run-with-pyroveil.sh <config-name> <command>
|
|
|
|
PYROVEIL_DIR="$pyroveil_dir"
|
|
|
|
if [[ \$# -lt 2 ]]; then
|
|
echo "Usage: \$0 <config-name> <command>"
|
|
echo "Available configs:"
|
|
ls "\$PYROVEIL_DIR/hacks/"
|
|
exit 1
|
|
fi
|
|
|
|
CONFIG_NAME="\$1"
|
|
shift
|
|
|
|
export PYROVEIL=1
|
|
export PYROVEIL_CONFIG="\$PYROVEIL_DIR/hacks/\$CONFIG_NAME/pyroveil.json"
|
|
|
|
echo "Running with Pyroveil config: \$CONFIG_NAME"
|
|
echo "Config file: \$PYROVEIL_CONFIG"
|
|
|
|
exec "\$@"
|
|
EOF
|
|
|
|
chown "$SUDO_USER:$SUDO_USER" "$user_home/run-with-pyroveil.sh"
|
|
chmod +x "$user_home/run-with-pyroveil.sh"
|
|
echo "✓ Created helper script: $user_home/run-with-pyroveil.sh"
|
|
|
|
else
|
|
echo "Skipping Pyroveil installation"
|
|
echo "Note: You can manually install it later for mesh shader issues"
|
|
fi
|
|
}
|