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
+68
-55
@@ -2,66 +2,79 @@
|
||||
# Shared helpers for gaming submodules
|
||||
|
||||
_install_mesa_32bit() {
|
||||
local mesa_pkgs=(
|
||||
"mesa-vulkan-drivers" "mesa-vulkan-drivers:i386"
|
||||
"libgl1-mesa-dri" "libgl1-mesa-dri:i386"
|
||||
"libglx-mesa0" "libglx-mesa0:i386"
|
||||
"libegl-mesa0" "libegl-mesa0:i386"
|
||||
"mesa-va-drivers" "mesa-va-drivers:i386"
|
||||
local base_pkgs=(
|
||||
"mesa-vulkan-drivers"
|
||||
"libgl1-mesa-dri"
|
||||
"libglx-mesa0"
|
||||
"libegl-mesa0"
|
||||
"mesa-va-drivers"
|
||||
"mesa-libgallium"
|
||||
)
|
||||
|
||||
local ref_ver
|
||||
ref_ver=$(apt-cache policy mesa-vulkan-drivers:i386 2>/dev/null | awk 'NR==3 {print $2; exit}')
|
||||
local ref_bpo_ver
|
||||
ref_bpo_ver=$(apt-cache madison mesa-vulkan-drivers:i386 2>/dev/null | \
|
||||
grep "${DEBIAN_CODENAME}-backports" | awk '{print $3}' | head -1)
|
||||
local comp_line="Components: Vulkan:i386, OpenGL:i386, GLX:i386, EGL:i386, VA-API:i386"
|
||||
local i386_active=false
|
||||
dpkg --print-foreign-architectures 2>/dev/null | grep -q i386 && i386_active=true
|
||||
|
||||
if [ "$(is_backports_enabled)" == "true" ] && [ -n "$ref_bpo_ver" ]; then
|
||||
local bpo_pkgs=()
|
||||
local stable_pkgs=()
|
||||
local install_list=()
|
||||
|
||||
for mpkg in "${mesa_pkgs[@]}"; do
|
||||
local bpo_ver
|
||||
bpo_ver=$(apt-cache madison "$mpkg" 2>/dev/null | \
|
||||
grep "${DEBIAN_CODENAME}-backports" | awk '{print $3}' | head -1)
|
||||
if [ -n "$bpo_ver" ]; then
|
||||
bpo_pkgs+=("$mpkg")
|
||||
else
|
||||
stable_pkgs+=("$mpkg")
|
||||
fi
|
||||
done
|
||||
|
||||
local src_label="Debian ${DEBIAN_CODENAME^}-Backports"
|
||||
[ ${#stable_pkgs[@]} -gt 0 ] && src_label+=" + Stable"
|
||||
|
||||
local msg="Mesa 32-bit drivers required for gaming.\n\n"
|
||||
msg+="Source: ${src_label}\n"
|
||||
msg+="Mesa ${ref_bpo_ver:-$ref_ver}\n"
|
||||
msg+="${comp_line}\n\n"
|
||||
[ ${#stable_pkgs[@]} -gt 0 ] && msg+="Some packages only available in stable.\n"
|
||||
msg+="Choose version:"
|
||||
|
||||
if _confirm_custom "Mesa 32-bit" "$msg" "Backports" "Stable" 14 70; then
|
||||
_run_cmd "Mesa 32-bit" "sudo apt install -y -t ${DEBIAN_CODENAME}-backports ${bpo_pkgs[*]}" \
|
||||
"Installing 32-bit Mesa from backports..."
|
||||
if [ ${#stable_pkgs[@]} -gt 0 ]; then
|
||||
_run_cmd "Mesa 32-bit" "sudo apt install -y ${stable_pkgs[*]}" \
|
||||
"Installing remaining 32-bit Mesa from stable..."
|
||||
fi
|
||||
else
|
||||
_run_cmd "Mesa 32-bit" "sudo apt install -y ${mesa_pkgs[*]}" \
|
||||
"Installing 32-bit Mesa from stable..."
|
||||
for p in "${base_pkgs[@]}"; do
|
||||
if apt-cache show "$p" >/dev/null 2>&1; then
|
||||
install_list+=("$p")
|
||||
fi
|
||||
else
|
||||
local msg="Mesa 32-bit drivers required for gaming.\n\n"
|
||||
msg+="Source: Debian Stable\n"
|
||||
msg+="Mesa ${ref_ver}\n"
|
||||
msg+="${comp_line}\n\n"
|
||||
msg+="Install Mesa 32-bit drivers?"
|
||||
if _confirm "Mesa 32-bit" "$msg" 14 70; then
|
||||
_run_cmd "Mesa 32-bit" "sudo apt install -y ${mesa_pkgs[*]}" \
|
||||
"Installing 32-bit Mesa..."
|
||||
if $i386_active && apt-cache show "${p}:i386" >/dev/null 2>&1; then
|
||||
install_list+=("${p}:i386")
|
||||
fi
|
||||
done
|
||||
|
||||
if [ ${#install_list[@]} -eq 0 ]; then
|
||||
echo "No Mesa 32-bit packages available for installation."
|
||||
return
|
||||
fi
|
||||
|
||||
_run_cmd "Mesa 32-bit" "sudo apt install -y ${install_list[*]}" \
|
||||
"Installing Mesa drivers (${#install_list[@]} packages)..."
|
||||
}
|
||||
|
||||
apt_cache_exists() {
|
||||
apt-cache show "$1" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
_detect_installed_nvidia_driver() {
|
||||
dpkg -l 2>/dev/null | awk '
|
||||
/^ii/ && ($2=="nvidia-driver" || $2=="nvidia-open" ||
|
||||
$2 ~ /^nvidia-legacy-[0-9]+xx-driver$/ ||
|
||||
$2 ~ /^nvidia-tesla-[0-9]+-driver$/) {print $2; exit}'
|
||||
}
|
||||
|
||||
_nvidia_libs_pkg() {
|
||||
case "$1" in
|
||||
nvidia-driver|nvidia-open) echo "nvidia-driver-libs" ;;
|
||||
*) echo "${1}-libs" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
_install_nvidia_32bit() {
|
||||
local drv_pkg
|
||||
drv_pkg=$(_detect_installed_nvidia_driver)
|
||||
if [ -z "$drv_pkg" ]; then
|
||||
_msg "NVIDIA 32-bit" \
|
||||
"No NVIDIA driver detected.\n\nRun Graphics Drivers (option 5) first,\nthen return to add 32-bit libraries." 10 60
|
||||
return 0
|
||||
fi
|
||||
|
||||
local drv_ver
|
||||
drv_ver=$(dpkg -s "$drv_pkg" 2>/dev/null | sed -n 's/^Version: //p')
|
||||
local libs_pkg
|
||||
libs_pkg=$(_nvidia_libs_pkg "$drv_pkg")
|
||||
|
||||
if ! apt_cache_exists "${libs_pkg}:i386"; then
|
||||
_msg "NVIDIA 32-bit" \
|
||||
"No ${libs_pkg}:i386 available for your driver (${drv_pkg}).\nSkipping 32-bit NVIDIA libraries." 10 60
|
||||
return 0
|
||||
fi
|
||||
|
||||
if _confirm "NVIDIA 32-bit" \
|
||||
"Driver: ${drv_pkg} ${drv_ver}\n\nInstall ${libs_pkg}:i386 (same version to prevent ABI mismatch)." 12 70; then
|
||||
_run_cmd "NVIDIA 32-bit" "sudo apt install -y ${libs_pkg}:i386=${drv_ver}" \
|
||||
"Installing 32-bit NVIDIA libraries (${drv_ver})..."
|
||||
fi
|
||||
}
|
||||
|
||||
+32
-12
@@ -3,17 +3,37 @@
|
||||
|
||||
install_heroic() {
|
||||
local heroic_deb="/tmp/heroic.deb"
|
||||
_run_cmd "Heroic" "sudo apt install -y curl wget" "Installing dependencies..."
|
||||
local gh_url
|
||||
gh_url=$(curl -s --connect-timeout 10 https://api.github.com/repos/Heroic-Games-Launcher/\
|
||||
HeroicGamesLauncher/releases/latest | \
|
||||
grep -oP 'https://[^"]+amd64\.deb' | head -1)
|
||||
if [ -z "$gh_url" ]; then
|
||||
echo -e "${RED}Could not determine latest Heroic release.${NC}"
|
||||
else
|
||||
_run_cmd "Heroic" "wget -O $heroic_deb $gh_url" "Downloading Heroic..."
|
||||
_run_cmd "Heroic" "sudo apt install -y $heroic_deb" "Installing Heroic..."
|
||||
rm -f "$heroic_deb"
|
||||
echo -e "${GREEN}Heroic Games Launcher installed.${NC}"
|
||||
local ua="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
|
||||
|
||||
_run_cmd "Heroic" "sudo apt install -y curl jq" "Installing dependencies..."
|
||||
|
||||
local json
|
||||
json=$(curl -s --connect-timeout 10 -H "User-Agent: $ua" \
|
||||
"https://api.github.com/repos/Heroic-Games-Launcher/HeroicGamesLauncher/releases/latest") || {
|
||||
_msg "Heroic Error" "Could not fetch release data from GitHub API." 8 60
|
||||
return 1
|
||||
}
|
||||
|
||||
local deb_url
|
||||
deb_url=$(echo "$json" | jq -r '
|
||||
.assets[] | select(.name | endswith("amd64.deb")) | .browser_download_url
|
||||
' 2>/dev/null || true)
|
||||
|
||||
if [ -z "$deb_url" ]; then
|
||||
_msg "Heroic Error" "Could not find amd64.deb asset in latest release." 10 60
|
||||
return 1
|
||||
fi
|
||||
|
||||
_run_cmd "Heroic" "curl -sL -H 'User-Agent: $ua' -o '$heroic_deb' '$deb_url'" "Downloading Heroic..."
|
||||
|
||||
if ! dpkg-deb --info "$heroic_deb" >/dev/null 2>&1; then
|
||||
_msg "Heroic Error" "Downloaded .deb is corrupted or truncated.\n\nRemoving file." 10 60
|
||||
rm -f "$heroic_deb"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo -e "${GREEN}Package integrity verified.${NC}"
|
||||
_run_cmd "Heroic" "sudo apt install -y '$heroic_deb'" "Installing Heroic..."
|
||||
rm -f "$heroic_deb"
|
||||
echo -e "${GREEN}Heroic Games Launcher installed.${NC}"
|
||||
}
|
||||
|
||||
+48
-20
@@ -26,34 +26,63 @@ install_lutris() {
|
||||
}
|
||||
|
||||
install_openrgb() {
|
||||
local url
|
||||
if [ "$DEBIAN_VERSION" = "12" ]; then
|
||||
url="https://codeberg.org/OpenRGB/OpenRGB/releases/download/release_candidate_1.0rc2/openrgb_1.0rc2_amd64_bookworm_0fca93e.deb"
|
||||
elif [ "$DEBIAN_VERSION" = "13" ]; then
|
||||
url="https://codeberg.org/OpenRGB/OpenRGB/releases/download/release_candidate_1.0rc2/openrgb_1.0rc2_amd64_trixie_0fca93e.deb"
|
||||
else
|
||||
echo "OpenRGB requires Debian 12 (Bookworm) or 13 (Trixie)."
|
||||
return 1
|
||||
fi
|
||||
local deb_suffix
|
||||
case "$DEBIAN_CODENAME" in
|
||||
bookworm) deb_suffix="bookworm" ;;
|
||||
trixie) deb_suffix="trixie" ;;
|
||||
*)
|
||||
echo "OpenRGB requires Debian 12 (Bookworm) or 13 (Trixie)."
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
||||
local deb_path="/tmp/openrgb.deb"
|
||||
local ua="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
|
||||
|
||||
_run_cmd "OpenRGB" "curl -L -o ${deb_path} -A '${ua}' '${url}'" "Downloading OpenRGB..."
|
||||
_run_cmd "OpenRGB" "sudo apt install -y curl jq" "Installing dependencies..."
|
||||
|
||||
if [ ! -s "${deb_path}" ]; then
|
||||
echo -e "${RED}[-]${NC} Download failed: empty or missing file."
|
||||
rm -f "${deb_path}"
|
||||
local json
|
||||
json=$(curl -s --connect-timeout 10 \
|
||||
"https://codeberg.org/api/v1/repos/OpenRGB/OpenRGB/releases?limit=1") || {
|
||||
echo -e "${RED}Could not fetch OpenRGB releases from Codeberg API.${NC}"
|
||||
return 1
|
||||
}
|
||||
|
||||
local deb_url sha256
|
||||
while IFS=' ' read -r url hash; do
|
||||
deb_url="$url"
|
||||
sha256="$hash"
|
||||
done < <(echo "$json" | jq -r '
|
||||
.[0].assets[] | select(.name | contains("amd64_'"${deb_suffix}"'.deb")) |
|
||||
"\(.browser_download_url) \(.sha256 // "")"
|
||||
' 2>/dev/null)
|
||||
|
||||
if [ -z "$deb_url" ]; then
|
||||
echo -e "${RED}Could not find OpenRGB .deb for ${DEBIAN_CODENAME^}.${NC}"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo -e "${GREEN}[+]${NC} Installing OpenRGB package..."
|
||||
if ! sudo apt install -y "${deb_path}"; then
|
||||
rm -f "${deb_path}"
|
||||
echo -e "${RED}[-]${NC} Package installation failed."
|
||||
return 1
|
||||
_run_cmd "OpenRGB" "curl -L -o '${deb_path}' -A '${ua}' '${deb_url}'" "Downloading OpenRGB..."
|
||||
|
||||
if [ -n "$sha256" ]; then
|
||||
if ! echo "$sha256 $deb_path" | sha256sum -c --strict; then
|
||||
echo -e "${RED}SHA256 mismatch! Downloaded file may be corrupted. Removing.${NC}"
|
||||
rm -f "$deb_path"
|
||||
return 1
|
||||
fi
|
||||
echo -e "${GREEN}SHA256 verified.${NC}"
|
||||
else
|
||||
if ! dpkg-deb --info "$deb_path" >/dev/null 2>&1; then
|
||||
echo -e "${RED}Downloaded .deb is corrupted. Removing.${NC}"
|
||||
rm -f "$deb_path"
|
||||
return 1
|
||||
fi
|
||||
echo -e "${YELLOW}No SHA256 in API, validated via dpkg-deb.${NC}"
|
||||
fi
|
||||
|
||||
sudo apt install -y "$deb_path"
|
||||
rm -f "$deb_path"
|
||||
|
||||
sudo modprobe i2c-dev
|
||||
if ! grep -q "^i2c-dev" /etc/modules 2>/dev/null; then
|
||||
echo "i2c-dev" | sudo tee -a /etc/modules >/dev/null
|
||||
@@ -62,8 +91,7 @@ install_openrgb() {
|
||||
sudo udevadm control --reload-rules && sudo udevadm trigger
|
||||
sudo setcap cap_sys_rawio=ep /usr/bin/openrgb 2>/dev/null || true
|
||||
|
||||
rm -f "${deb_path}"
|
||||
echo -e "${GREEN}OpenRGB installed. NOTE: You must reboot or log out/in for the 'i2c' group to take effect.${NC}"
|
||||
echo -e "${GREEN}OpenRGB installed. Reboot or log out/in for i2c group to take effect.${NC}"
|
||||
_pause
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user