mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 21:18:08 +00:00
stornic56
9828ea439c
- Extracted hardware detection logic from firmware.sh into new modules/hw_detect.sh. Declares shared arrays (PCI_NET_DEVS, USB_WIFI_DEVS, etc) and _detect_all_network_devices() function. The main script now sources hw_detect.sh immediately after utils.sh. firmware.sh retains only _DETECTED_FW_PKGS and _FW_PLAN_PKG_LINES plus installation logic — the detection loop is fully removed, eliminating the circular dependency with bluetooth.sh. - Fixed interrupt safety in main script: removed pkill -f "apt.*install" and pkill -f "dpkg.*configure" from _on_interrupt(); updated exit message to "Temp files cleaned." Only the signal handler (trap _on_interrupt INT TERM) remains. - Added strict URL validation to modules/gaming/heroic.sh and modules/gaming/tools.sh using regex ^https://[A-Za-z0-9./_-]+\.deb$ before passing $deb_url to _run_cmd. Blocks command substitution, non-https URLs, and path traversal attempts that could bypass shell quoting. - Implemented real Bullseye Archive rewrite in modules/bullseye/legacy.sh: adds idempotency check (grep -q archive.debian.org && return 0), creates timestamped backup of /etc/apt/sources.list with sudo cp, writes exact archive Debian sources via sudo tee heredoc, and runs sudo apt-get update || true on failure. - Added local scope to modules/bluetooth.sh variable service_enable_only=false before the conditional assignment, preventing state bleed from the previous global-only declaration. - Applied safe array pattern (while IFS= read -r _pkg; do ...) across 32+ files in modules/extras/* and modules/bullseye/legacy.sh, replacing all vulnerable for pkg in $cleaned / for pkg in $install_list loops. Eliminates word-splitting and command-injection risks.
66 lines
2.1 KiB
Bash
66 lines
2.1 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 '"')
|
|
# BH-004: Convert to array to avoid word splitting and injection.
|
|
local -a _pkgs=()
|
|
while IFS= read -r _pkg; do
|
|
[ -n "$_pkg" ] && _pkgs+=("$_pkg")
|
|
done < <(echo "$cleaned" | tr ' ' '\n')
|
|
for ver in "${_pkgs[@]}"; 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"
|
|
}
|