mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 13:08:06 +00:00
stornic56
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.
96 lines
3.2 KiB
Bash
96 lines
3.2 KiB
Bash
#!/usr/bin/env bash
|
|
# communication.sh — Signal, Telegram, HexChat
|
|
|
|
_install_signal() {
|
|
_ensure_extrepo
|
|
if [ ! -f /etc/apt/sources.list.d/extrepo_signal.sources ]; then
|
|
_run_cmd "Signal" "sudo extrepo enable signal" "Enabling Signal repository..."
|
|
fi
|
|
_ensure_apt_updated
|
|
if ! is_installed "signal-desktop"; then
|
|
_run_cmd "Signal" "sudo apt install -y signal-desktop" "Installing Signal..."
|
|
echo -e "${GREEN}Signal installed.${NC}"
|
|
else
|
|
echo "Signal already installed."
|
|
fi
|
|
}
|
|
|
|
_install_telegram() {
|
|
if [ "$DEBIAN_VERSION" = "13" ]; then
|
|
if ! is_backports_enabled; then
|
|
_msg "telegram-desktop" \
|
|
"telegram-desktop is only available in Trixie-backports.\n\n\
|
|
Please enable backports first via:\n Main Menu → 3 Configure Repositories" 12 65
|
|
echo -e "${YELLOW}Skipping telegram-desktop.${NC}"
|
|
return
|
|
fi
|
|
if ! is_installed "telegram-desktop"; then
|
|
_run_cmd "Telegram" "sudo apt install -y -t ${DEBIAN_CODENAME}-backports telegram-desktop" \
|
|
"Installing telegram-desktop from backports..."
|
|
echo -e "${GREEN}telegram-desktop installed.${NC}"
|
|
else
|
|
echo "telegram-desktop already installed."
|
|
fi
|
|
else
|
|
if ! is_installed "telegram-desktop"; then
|
|
_run_install "telegram-desktop"
|
|
echo -e "${GREEN}telegram-desktop installed.${NC}"
|
|
else
|
|
echo "telegram-desktop already installed."
|
|
fi
|
|
fi
|
|
}
|
|
|
|
_cat_communication() {
|
|
local headless=false
|
|
_is_headless && headless=true
|
|
if $headless; then
|
|
echo "Communication apps require a GUI — skipping."
|
|
return
|
|
fi
|
|
|
|
local -a items=()
|
|
local signal_state
|
|
signal_state=$(_state "signal-desktop")
|
|
local telegram_state
|
|
telegram_state=$(_state "telegram-desktop")
|
|
local hexchat_state
|
|
hexchat_state=$(_state "hexchat")
|
|
items+=(
|
|
"signal-desktop" "Signal Private Messenger (extrepo)" "$signal_state"
|
|
"telegram-desktop" "Telegram Desktop messaging" "$telegram_state"
|
|
"hexchat" "IRC client (HexChat)" "$hexchat_state"
|
|
)
|
|
|
|
local item_count=${#items[@]}
|
|
local lista_alto=$((item_count > TUI_ALTO_LISTA ? TUI_ALTO_LISTA : item_count))
|
|
local choices
|
|
choices=$(_checklist "Communication" "Check [*] the packages you want installed/updated on your system.\n" \
|
|
$TUI_ALTO $TUI_ANCHO $lista_alto "${items[@]}")
|
|
clear
|
|
[ -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
|
|
signal-desktop) _install_signal ;;
|
|
telegram-desktop) _install_telegram ;;
|
|
hexchat)
|
|
if ! is_installed "hexchat"; then
|
|
_run_install "hexchat"
|
|
echo -e "${GREEN}hexchat installed.${NC}"
|
|
else
|
|
echo "hexchat already installed."
|
|
fi
|
|
;;
|
|
esac
|
|
done
|
|
echo -e "${GREEN}Communication tools installed.${NC}"
|
|
}
|