mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-07-16 05:49:49 +00:00
firmware & wireless refactor + extrepo Migration
- Created standalone modules/bluetooth.sh for `_install_bluetooth_stack()` with desktop-aware frontend selection (bluedevil/KDE, blueman/XFCE/other). Extracted from `firmware.sh`, reducing it from 438 to 369 lines. - Added `detect_desktop_environment()` and `detect_audio_server()` functions in `utils.sh` with new globals `DESKTOP_ENV=""` and `AUDIO_SERVER=""`. - New `found_active_wifi` flag detects Qualcomm Atheros AR9485 PCI chips without loaded firmware, displaying `(no driver — install firmware)` instead of silently disappearing. Auto-installs `firmware-atheros + firmware-linux-nonfree` after Firmware & Wireless Setup. - New `is_nvidia_blackwell()` detects GPUs in ranges `0x2900–0x29BF` and `0x2B80–0x31FF`. Added `_enable_cuda_repo()` helper for extrepo-based CUDA installation with APT pinning. DKMS verification blocks added to all `_install_nvidia_*` functions. - Standardized repository enablement across 7 modules using `_enable_*_repo()` helpers: - `internet.sh`: Firefox/Floorp/LibreWolf, Pale Moon, Tailscale, Mullvad VPN/Browser, ProtonVPN - `jellyfin.sh`, `programming.sh` (VSCodium), `java.sh` (Temurin) - New `extras/office/office.sh`: OnlyOffice + LibreOffice with language detection - The main script was reduced from 233 to 137 lines. Created new `modules/sysinfo.sh` (97 lines) for `_show_sysinfo()`. Source chain: `utils.sh → sysinfo.sh → sudo_config.sh → repos → firmware.sh → bluetooth.sh → gpu.sh → kernel.sh → gaming.sh → extras.sh → zram.sh → java.sh`. - Renamed menu to `"Firmware, Wireless & Bluetooth"`. Translated NTP dialog (English), basic programs install message, and NVIDIA 32-bit legacy messages.
This commit is contained in:
+12
-24
@@ -1,28 +1,16 @@
|
||||
#!/usr/bin/env bash
|
||||
# java.sh — Adoptium Temurin repository setup and Java version selectors
|
||||
# java.sh — Adoptium Temurin repository setup (extrepo) and Java version selectors
|
||||
# License GPL v3
|
||||
|
||||
_ensure_adoptium_repo() {
|
||||
[ -f /etc/apt/sources.list.d/adoptium.list ] && return 0
|
||||
|
||||
local deps=()
|
||||
! is_installed "wget" && deps+=("wget")
|
||||
! is_installed "apt-transport-https" && deps+=("apt-transport-https")
|
||||
! is_installed "gpg" && deps+=("gpg")
|
||||
[ ${#deps[@]} -gt 0 ] && _run_install_batch "${deps[@]}"
|
||||
|
||||
wget -qO - "https://packages.adoptium.net/artifactory/api/gpg/key/public" \
|
||||
| sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/adoptium.gpg 2>/dev/null
|
||||
|
||||
local codename
|
||||
codename=$(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release)
|
||||
echo "deb https://packages.adoptium.net/artifactory/deb ${codename} main" \
|
||||
| sudo tee /etc/apt/sources.list.d/adoptium.list > /dev/null
|
||||
|
||||
sudo apt update \
|
||||
-o Dir::Etc::sourcelist=/etc/apt/sources.list.d/adoptium.list \
|
||||
-o Dir::Etc::sourceparts="-" \
|
||||
2>/dev/null || true
|
||||
_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_gaming_java() {
|
||||
@@ -34,7 +22,7 @@ _install_gaming_java() {
|
||||
"21" "Java 21 — For modern Minecraft >= 1.20.5 & 1.21+" \
|
||||
3>&1 1>&2 2>&3)
|
||||
[ -z "$ver" ] && { echo "No Java version selected."; return; }
|
||||
_ensure_adoptium_repo
|
||||
_enable_temurin_repo
|
||||
_run_install "temurin-${ver}-jre"
|
||||
}
|
||||
|
||||
@@ -47,7 +35,7 @@ _install_dev_java() {
|
||||
"25" "Java 25 LTS Development Kit" \
|
||||
3>&1 1>&2 2>&3)
|
||||
[ -z "$ver" ] && { echo "No JDK version selected."; return; }
|
||||
_ensure_adoptium_repo
|
||||
_enable_temurin_repo
|
||||
_run_install "temurin-${ver}-jdk"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user