mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 21:18:08 +00:00
454207209a
- 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.
122 lines
4.3 KiB
Bash
122 lines
4.3 KiB
Bash
#!/usr/bin/env bash
|
|
# office.sh — Office & Productivity (OnlyOffice via extrepo, LibreOffice backports)
|
|
# License GPL v3
|
|
|
|
# ── OnlyOffice ──
|
|
_enable_onlyoffice_repo() {
|
|
if [ ! -f /etc/apt/sources.list.d/extrepo_onlyoffice-desktopeditors.sources ]; then
|
|
if ! command -v extrepo &>/dev/null; then
|
|
_run_cmd "extrepo" "sudo apt install -y extrepo" "Installing extrepo..."
|
|
fi
|
|
_run_cmd "OnlyOffice" "sudo extrepo enable onlyoffice-desktopeditors" "Enabling OnlyOffice repository..."
|
|
fi
|
|
_ensure_apt_updated
|
|
}
|
|
|
|
install_onlyoffice() {
|
|
local ver
|
|
ver=$(apt-cache policy onlyoffice-desktopeditors 2>/dev/null | awk 'NR==3 {print $2; exit}')
|
|
|
|
if _confirm "Install: OnlyOffice" "Install OnlyOffice Desktop Editors
|
|
Repository: download.onlyoffice.com
|
|
Version: ${ver:-unknown}"; then
|
|
_enable_onlyoffice_repo
|
|
_run_cmd "OnlyOffice" "sudo DEBIAN_FRONTEND=noninteractive apt install -y onlyoffice-desktopeditors" "Installing OnlyOffice..." || echo -e "${RED}OnlyOffice servers are currently slow or down. Please try again later.${NC}"
|
|
echo -e "${GREEN}OnlyOffice installed.${NC}"
|
|
fi
|
|
}
|
|
|
|
# ── Joplin (extrepo, solo Debian 12+) ──
|
|
install_joplin() {
|
|
if [ "$DEBIAN_VERSION" != "12" ] && [ "$DEBIAN_VERSION" != "13" ]; then
|
|
_msg "Joplin" "Joplin via extrepo is only available on\nDebian 12 (Bookworm) and 13 (Trixie)." 10 60
|
|
return 1
|
|
fi
|
|
_ensure_extrepo
|
|
if [ ! -f /etc/apt/sources.list.d/extrepo_joplin.sources ]; then
|
|
_run_cmd "Joplin" "sudo extrepo enable joplin" "Enabling Joplin repository..."
|
|
fi
|
|
_ensure_apt_updated
|
|
if ! is_installed "joplin"; then
|
|
_run_cmd "Joplin" "sudo apt install -y joplin" "Installing Joplin..."
|
|
echo -e "${GREEN}Joplin installed.${NC}"
|
|
else
|
|
echo "Joplin already installed."
|
|
fi
|
|
}
|
|
|
|
# ── LibreOffice (backports) ──
|
|
install_libreoffice_bpo() {
|
|
if [ "$DEBIAN_VERSION" != "12" ] && [ "$DEBIAN_VERSION" != "13" ]; then
|
|
_msg "LibreOffice" "LibreOffice backports only available on Debian 12+."
|
|
return
|
|
fi
|
|
|
|
local lang_pkg
|
|
lang_pkg=$(_detect_lang_pkg "libreoffice-l10n")
|
|
|
|
local ver
|
|
ver=$(apt-cache policy libreoffice 2>/dev/null | awk 'NR==3 {print $2; exit}')
|
|
local bpo_ver
|
|
bpo_ver=$(apt-cache madison libreoffice 2>/dev/null | grep "${DEBIAN_CODENAME}-backports" | awk '{print $3}' | head -1)
|
|
|
|
local msg="Install LibreOffice?\n\n"
|
|
msg+=" Stable: ${ver:-unknown}\n"
|
|
msg+=" Backports: ${bpo_ver:-unavailable}\n"
|
|
[ -n "$lang_pkg" ] && msg+=" Language: ${lang_pkg}\n"
|
|
|
|
if _confirm "LibreOffice" "$msg"; then
|
|
local pkgs="libreoffice${lang_pkg:+ $lang_pkg}"
|
|
if [ -n "$bpo_ver" ]; then
|
|
_run_cmd "LibreOffice" "sudo apt install -y -t ${DEBIAN_CODENAME}-backports $pkgs" \
|
|
"Installing LibreOffice from backports..."
|
|
else
|
|
_run_cmd "LibreOffice" "sudo apt install -y $pkgs" \
|
|
"Installing LibreOffice from stable..."
|
|
fi
|
|
echo -e "${GREEN}LibreOffice installed.${NC}"
|
|
fi
|
|
}
|
|
|
|
_cat_office() {
|
|
local headless=false
|
|
_is_headless && headless=true
|
|
local -a items=()
|
|
if ! $headless; then
|
|
items+=(
|
|
"onlyoffice" "OnlyOffice Desktop Editors (extrepo)" OFF
|
|
"libreoffice" "LibreOffice (backports on Bookworm/Trixie)" OFF
|
|
)
|
|
if [ "$DEBIAN_VERSION" = "12" ] || [ "$DEBIAN_VERSION" = "13" ]; then
|
|
items+=(
|
|
"joplin" "Joplin note-taking (extrepo)" OFF
|
|
)
|
|
fi
|
|
fi
|
|
|
|
local item_count=${#items[@]}
|
|
local lista_alto=$((item_count > TUI_ALTO_LISTA ? TUI_ALTO_LISTA : item_count))
|
|
local choices
|
|
choices=$(
|
|
_checklist "Office & Productivity" "Check [*] the packages you want installed/updated on your system.\n" $TUI_ALTO $TUI_ANCHO $lista_alto \
|
|
"${items[@]}"
|
|
)
|
|
|
|
[ -z "$choices" ] && return
|
|
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 pkg in "${_pkgs[@]}"; do
|
|
case $pkg in
|
|
onlyoffice) install_onlyoffice ;;
|
|
libreoffice) install_libreoffice_bpo ;;
|
|
joplin) install_joplin ;;
|
|
esac
|
|
done
|
|
}
|