mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-07-16 05:49:49 +00:00
critical-fixes, swap module & gaming overhaul
- Fixed script crashes from `whiptail` Cancel/Esc under `set -e`. Added `_menu()`, `_checklist()` and `_inputbox()` wrappers with `|| true` to prevent premature exits. - Resolved startup failures by using defaults instead of relying on unset variables with `set -u`. - Hardened sudoers management — `_validate_sudoers()` writes to temp file, validates with `visudo -cf`, only copies if successful. - Replaced `eval` in `_run_cmd` with safer `bash -c` execution. Swap Management Module (`modules/swap.sh`) - New standalone module with 9 internal functions and `manage_swap()` entry point. - Btrfs CoW detection — applies `chattr +C` before swapfile creation to prevent mkswap rejection on Btrfs. - Dynamic swappiness configuration — reads current system value instead of hardcoding 60, pre-fills inputbox with existing setting. - Uses `/run/lock/debianito-swap.lock` for early init compatibility (added as option 9 in main menu). Repository & Branch Migration (`modules/repos/migrate.sh`) - Handles branch migration from stable (11/12) to Testing or SID with 5-screen UX flow. - Persistent backup system — creates timestamped tar.gz backups of `/etc/apt/sources.list*`, auto-restores on apt update failure. - SID guardrails — installs `apt-listbugs` and `apt-listchanges` before upgrade to warn about critical bugs in unstable packages. - Dynamic menu options based on Debian version (SID shows only 1-2-3 Exit, non-SID includes backports + branch migration). - New `_components_enabled()` helper detects current contrib/non-free state. Gaming Module Overhaul - Unified gaming checklist — merged i386 toggle into single prompt with lazy evaluation instead of separate pre-check. - Lazy 32-bit architecture enablement — only enables i386 when needed (steam/lutris/i386 selected) and installs graphics drivers if `need_32bit=true`. - New `_install_nvidia_32bit()` helper with proper driver detection, version pinning, and legacy/tesla variant handling. Heroic & OpenRGB Downloads - Heroic — fetches latest release from GitHub API using `jq` to extract amd64.deb URL, validates with `dpkg-deb --info`. - OpenRGB — downloads from Codeberg Gitea API with SHA256 verification when available, fallback to `dpkg-deb` validation. - Dynamic codename detection — now detects Bookworm vs Trixie at runtime instead of hardcoded static values for .deb download URLs. |Other Improvements - Renumbered main menu: 8=ZRAM, 9=Swap Management, 10=Extras, 11=Boot Rescue, 12=Exit. - Improved `detect_storage()` — excludes loop/CD-ROM devices via `lsblk -e 7,11`, explicitly skips zram, detects USB/SD via `/sys/block/$name/removable`. - Standardized SCROLL_HINT across all files with centralized readonly variable.
This commit is contained in:
stornic56
+35
-97
@@ -49,105 +49,20 @@ ensure_contrib_repo() {
|
||||
install_gaming() {
|
||||
echo -e "${YELLOW}Gaming setup...${NC}"
|
||||
|
||||
# 1. 32-bit support prompt FIRST
|
||||
local enable_32bit=false
|
||||
if _confirm "32-bit Support" "Enable i386 architecture for 32-bit games?\n\nRequired by Steam/Proton for 32-bit games.\nInstalls matching 32-bit graphics drivers."; then
|
||||
enable_32bit=true
|
||||
fi
|
||||
|
||||
if $enable_32bit; then
|
||||
echo "Enabling 32-bit architecture (i386)..."
|
||||
if ! dpkg --print-foreign-architectures | grep -q i386; then
|
||||
sudo dpkg --add-architecture i386
|
||||
fi
|
||||
_run_cmd "APT Update" "sudo apt update" "Updating package lists..."
|
||||
|
||||
echo "Installing 32-bit graphics drivers..."
|
||||
if [ "$GPU_TYPE" = "nvidia" ]; then
|
||||
case "${NVIDIA_DRIVER_MODE:-stable}" in
|
||||
cuda-repo)
|
||||
local nv32_pkg="nvidia-driver-libs:i386"
|
||||
local nv32_ver
|
||||
nv32_ver=$(dpkg -l "$nv32_pkg" 2>/dev/null | awk '/^ii/ {print $3}')
|
||||
if [ -z "$nv32_ver" ] || ! echo "$nv32_ver" | grep -q "^590"; then
|
||||
local msg="Source: NVIDIA CUDA Repository (Pinned v590)\n"
|
||||
msg+="NVIDIA 32-bit Libraries (v590 branch)\n\n"
|
||||
msg+="[+] nvidia-driver-libs:i386"
|
||||
if _confirm "NVIDIA 32-bit" "$msg" 12 70; then
|
||||
_run_cmd "32-bit NVIDIA" \
|
||||
"sudo apt install -y ${nv32_pkg}" \
|
||||
"Installing 32-bit NVIDIA libraries from CUDA repo..."
|
||||
fi
|
||||
else
|
||||
_msg "NVIDIA 32-bit" \
|
||||
"32-bit NVIDIA CUDA libraries already deployed.\n\nv590 ${nv32_ver}" 10 70
|
||||
fi
|
||||
;;
|
||||
backports)
|
||||
local nv32_pkg="nvidia-driver-libs:i386"
|
||||
local nv32_ver
|
||||
nv32_ver=$(apt-cache policy "$nv32_pkg" 2>/dev/null | awk 'NR==3 {print $2; exit}')
|
||||
local msg="Source: Debian ${DEBIAN_CODENAME^}-Backports\n"
|
||||
msg+="NVIDIA 32-bit Libraries ${nv32_ver:-unknown}\n\n"
|
||||
msg+="[+] nvidia-driver-libs:i386"
|
||||
if _confirm "NVIDIA 32-bit" "$msg" 12 70; then
|
||||
_run_cmd "32-bit NVIDIA" "sudo apt install -y -t ${DEBIAN_CODENAME}-backports ${nv32_pkg}" \
|
||||
"Installing 32-bit NVIDIA drivers from backports..."
|
||||
fi
|
||||
;;
|
||||
stable)
|
||||
local nv32_pkg="nvidia-driver-libs:i386"
|
||||
local nv32_ver
|
||||
nv32_ver=$(apt-cache policy "$nv32_pkg" 2>/dev/null | awk 'NR==3 {print $2; exit}')
|
||||
local use_bpo32=false
|
||||
if [ "$(is_backports_enabled)" == "true" ]; then
|
||||
local bpo_nv32_ver
|
||||
bpo_nv32_ver=$(apt-cache madison "$nv32_pkg" 2>/dev/null | \
|
||||
grep "${DEBIAN_CODENAME}-backports" | awk '{print $3}' | head -1)
|
||||
if [ -n "$bpo_nv32_ver" ]; then
|
||||
local msg="Source: Debian ${DEBIAN_CODENAME^} (Backports available)\n"
|
||||
msg+="NVIDIA 32-bit Libraries: ${nv32_pkg}\n\n"
|
||||
msg+=" Backports: ${bpo_nv32_ver}\n"
|
||||
msg+=" Stable: ${nv32_ver:-unknown}\n\n"
|
||||
msg+="Choose version:"
|
||||
if _confirm_custom "NVIDIA 32-bit" "$msg" "Backports" "Stable" 14 70; then
|
||||
use_bpo32=true
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if $use_bpo32; then
|
||||
_run_cmd "32-bit NVIDIA" "sudo apt install -y -t ${DEBIAN_CODENAME}-backports ${nv32_pkg}" \
|
||||
"Installing 32-bit NVIDIA drivers from backports..."
|
||||
else
|
||||
local msg="Source: Debian ${DEBIAN_CODENAME^} Stable\n"
|
||||
msg+="NVIDIA 32-bit Libraries ${nv32_ver:-unknown}\n\n"
|
||||
msg+="[+] nvidia-driver-libs:i386"
|
||||
if _confirm "NVIDIA 32-bit" "$msg" 12 70; then
|
||||
_run_cmd "32-bit NVIDIA" "sudo apt install -y ${nv32_pkg}" \
|
||||
"Installing 32-bit NVIDIA drivers..."
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
else
|
||||
_install_mesa_32bit
|
||||
fi
|
||||
fi
|
||||
|
||||
# 2. Gaming packages checklist
|
||||
# 1. Single checklist with ALL options (including i386 toggle)
|
||||
local choices
|
||||
choices=$(whiptail --title "Gaming Setup" --checklist \
|
||||
choices=$(_checklist "Gaming Setup" \
|
||||
"Select gaming packages to install${SCROLL_HINT}:" $TUI_ALTO $TUI_ANCHO $TUI_ALTO_LISTA \
|
||||
"steam" "Steam (requires 32-bit support)" ON \
|
||||
"gamemode" "Game performance optimization" ON \
|
||||
"mangohud" "Performance overlay (Vulkan/OpenGL)" ON \
|
||||
"heroic" "Heroic Launcher (Epic/GOG)" OFF \
|
||||
"java" "Java Runtimes (8, 17, 21)" OFF \
|
||||
"goverlay" "MangoHud config GUI" ON \
|
||||
"heroic" "Heroic Launcher (Epic/GOG)" OFF \
|
||||
"java" "Minecraft Java Runtime" OFF \
|
||||
"openrgb" "OpenRGB (RGB lighting control)$(_inst openrgb)" OFF \
|
||||
"lutris" "Game launcher/manager" OFF \
|
||||
"lutris" "Lutris + Wine (requires 32-bit support)" OFF \
|
||||
"retroarch" "RetroArch Emulator Frontend$(_inst retroarch)" OFF \
|
||||
3>&1 1>&2 2>&3)
|
||||
"i386" "Enable 32-bit (i386) architecture" ON)
|
||||
|
||||
if [ -z "$choices" ]; then
|
||||
echo "No gaming packages selected."
|
||||
@@ -158,14 +73,37 @@ install_gaming() {
|
||||
local cleaned
|
||||
cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
# 3. Warn if Steam selected without 32-bit
|
||||
if echo "$cleaned" | grep -qw "steam" && ! $enable_32bit; then
|
||||
echo -e "${YELLOW}Warning: Steam requires 32-bit support.${NC}"
|
||||
echo "Installation may fail. Re-run this option and enable 32-bit support."
|
||||
# 2. Determine if 32-bit is needed (steam, lutris, or explicit i386 toggle)
|
||||
local need_32bit=false
|
||||
for p in $cleaned; do
|
||||
case $p in steam|lutris) need_32bit=true ;; esac
|
||||
done
|
||||
echo "$cleaned" | grep -qw i386 && need_32bit=true
|
||||
|
||||
# Strip pseudo-entry "i386" from the install list
|
||||
local install_list
|
||||
install_list=$(echo "$cleaned" | tr ' ' '\n' | grep -v '^i386$' | tr '\n' ' ')
|
||||
install_list=${install_list% }
|
||||
|
||||
# 3. Enable i386 architecture if needed
|
||||
if $need_32bit && ! dpkg --print-foreign-architectures 2>/dev/null | grep -q i386; then
|
||||
echo -e "${YELLOW}Enabling i386 architecture (required by selection)...${NC}"
|
||||
sudo dpkg --add-architecture i386
|
||||
_run_cmd "APT Update" "sudo apt update" "Updating package lists..."
|
||||
fi
|
||||
|
||||
# 4. Install selected packages
|
||||
for pkg in $cleaned; do
|
||||
# 4. Install 32-bit graphics drivers only if 32-bit is needed
|
||||
if $need_32bit; then
|
||||
echo "Installing 32-bit graphics drivers..."
|
||||
if [ "$GPU_TYPE" = "nvidia" ]; then
|
||||
_install_nvidia_32bit
|
||||
else
|
||||
_install_mesa_32bit
|
||||
fi
|
||||
fi
|
||||
|
||||
# 5. Install selected packages
|
||||
for pkg in $install_list; do
|
||||
case $pkg in
|
||||
steam)
|
||||
if ensure_contrib_repo; then
|
||||
|
||||
Reference in New Issue
Block a user