mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-07-16 05:49:49 +00:00
a91b0caa25
- 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.
54 lines
1.8 KiB
Bash
54 lines
1.8 KiB
Bash
#!/usr/bin/env bash
|
|
# java.sh — Adoptium Temurin repository setup (extrepo) and Java version selectors
|
|
# License GPL v3
|
|
|
|
_enable_temurin_repo() {
|
|
if [ -f /etc/apt/sources.list.d/extrepo_temurin.sources ]; then
|
|
return 0
|
|
fi
|
|
if ! command -v extrepo &>/dev/null; then
|
|
_run_cmd "extrepo" "sudo apt install -y extrepo" "Installing extrepo..."
|
|
fi
|
|
_run_cmd "Temurin" "sudo extrepo enable temurin" "Enabling Adoptium Temurin repository..."
|
|
_run_cmd "APT Update" "sudo apt update" "Updating package lists..."
|
|
}
|
|
|
|
install_minecraft_java() {
|
|
local choices
|
|
choices=$(_checklist "Java Runtimes for Minecraft" \
|
|
"Select Java version(s) to install:" 14 65 3 \
|
|
"8" "Java 8 — Classic mods & Minecraft <= 1.16.5" OFF \
|
|
"17" "Java 17 — Minecraft 1.17 to 1.20.4" ON \
|
|
"21" "Java 21 — Modern Minecraft >= 1.20.5 & 1.21+" OFF)
|
|
[ -z "$choices" ] && { echo "No Java version selected."; return; }
|
|
_enable_temurin_repo
|
|
local cleaned
|
|
cleaned=$(echo "$choices" | tr -d '"')
|
|
for ver in $cleaned; do
|
|
_run_cmd "Java" "sudo apt install -y temurin-${ver}-jre" \
|
|
"Installing Temurin JRE ${ver}..."
|
|
done
|
|
}
|
|
|
|
_install_dev_java() {
|
|
local ver
|
|
ver=$(_menu "Java Development Kits (JDK)" \
|
|
"Select JDK version:" 12 60 3 \
|
|
"17" "Java 17 LTS Development Kit" \
|
|
"21" "Java 21 LTS Development Kit" \
|
|
"25" "Java 25 LTS Development Kit")
|
|
[ -z "$ver" ] && { echo "No JDK version selected."; return; }
|
|
_enable_temurin_repo
|
|
_run_install "temurin-${ver}-jdk"
|
|
}
|
|
|
|
_any_jdk_installed_desc() {
|
|
local inst
|
|
inst=$(dpkg -l 'temurin-*-jdk' 2>/dev/null | awk '/^ii/ {print $2; exit}')
|
|
[ -n "$inst" ] && echo " ($inst installed)" || echo ""
|
|
}
|
|
|
|
_any_jdk_state() {
|
|
dpkg -l 'temurin-*-jdk' 2>/dev/null | grep -q '^ii' && echo "ON" || echo "OFF"
|
|
}
|