mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-09-14 06:02:35 +00:00
stornic56
8c922ee424
- Replaced the restrictive Broadcom firmware installation flow with a persistent, step-by-step process in modules/firmware.sh. Now installs dkms, wireless-tools, and linux-headers-amd64 separately, then applies blacklist configuration, updates initramfs, and loads conflicting modules properly. - Fixed conky package name across system.sh and bullseye/extras.sh. Changed from "conky" to "conky-all" with corresponding state variable updates for correct installation via apt. - Corrected broken GRUB sed command in modules/gpu.sh for AMD GCN support. Added grep guard to prevent duplicate parameter insertion and fixed regex pattern for proper cmdline modification. - Added whiptail pre-flight check in debianito.sh. Auto-installs required TUI dependencies if missing before the main menu, preventing runtime failures. - Fixed home directory path resolution bug in modules/sudo_config.sh. Replaced eval echo "~$USER" with getent passwd approach for reliable user home detection across SUDO_USER contexts. - Implemented global lspci output caching across 18+ locations. Single cache population via _init_lspci_cache() before detect_gpu, all subsequent reads use LSPCI_OUTPUT variable to eliminate redundant hardware polling calls. - Added apt update deduplication helper in modules/utils.sh. _ensure_apt_updated() with APT_UPDATED flag bypasses redundant package list refreshes across extras/, gaming/, firmware/, and desktop_display/ modules while preserving transactional rollback paths in repos.sh. - Fixed STATE_REFRESHED logic in debianito.sh main_menu case statement. Added STATE_REFRESHED=true to branches 3, 5, 7, 9, 11, 12, and 13 that mutate system state, ensuring refresh_system_state() triggers correctly after configuration changes. - Removed dead REPOS_CONFIGURED variable from debianito.sh and modules/repos.sh. Variable was written but never read, eliminated to clean up global namespace without affecting repository functionality.
61 lines
1.9 KiB
Bash
61 lines
1.9 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..."
|
|
_ensure_apt_updated
|
|
}
|
|
|
|
install_minecraft_java() {
|
|
local choices
|
|
choices=$(_checklist "Java Runtimes for Minecraft" \
|
|
"Select Java version(s) to install:" 15 65 4 \
|
|
"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 \
|
|
"25" "Java 25 — Minecraft 26+" 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"
|
|
}
|