mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 13:08:06 +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.
44 lines
1.7 KiB
Bash
44 lines
1.7 KiB
Bash
#!/usr/bin/env bash
|
|
# Heroic Games Launcher installation from GitHub releases
|
|
|
|
install_heroic() {
|
|
local heroic_deb
|
|
heroic_deb=$(mktemp "${TMPDIR:-/tmp}/heroic-XXXXXX.deb") || return 1
|
|
local ua="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
|
|
|
|
_run_cmd "Heroic" "sudo apt install -y curl jq" "Installing dependencies..."
|
|
|
|
local json
|
|
json=$(curl -s --connect-timeout 10 -H "User-Agent: $ua" \
|
|
"https://api.github.com/repos/Heroic-Games-Launcher/HeroicGamesLauncher/releases/latest") || {
|
|
_msg "Heroic Error" "Could not fetch release data from GitHub API." 8 60
|
|
return 1
|
|
}
|
|
|
|
local deb_url
|
|
deb_url=$(echo "$json" | jq -r '
|
|
.assets[] | select(.name | endswith("amd64.deb")) | .browser_download_url
|
|
' 2>/dev/null || true)
|
|
|
|
if [ -z "$deb_url" ]; then
|
|
_msg "Heroic Error" "Could not find amd64.deb asset in latest release." 10 60
|
|
return 1
|
|
fi
|
|
|
|
# Strict URL validation before interpolating into a shell command (_run_cmd uses bash -c)
|
|
[[ "$deb_url" =~ ^https://[A-Za-z0-9./_-]+\.deb$ ]] || { _msg "Error" "Invalid download URL: $deb_url"; return 1; }
|
|
|
|
_run_cmd "Heroic" "curl -fsSL -H 'User-Agent: $ua' -o '$heroic_deb' '$deb_url'" "Downloading Heroic..."
|
|
|
|
if ! dpkg-deb --info "$heroic_deb" >/dev/null 2>&1; then
|
|
_msg "Heroic Error" "Downloaded .deb is corrupted or truncated.\n\nRemoving file." 10 60
|
|
rm -f "$heroic_deb"
|
|
return 1
|
|
fi
|
|
|
|
echo -e "${GREEN}Package integrity verified.${NC}"
|
|
_run_cmd "Heroic" "sudo apt install -y '$heroic_deb'" "Installing Heroic..."
|
|
rm -f "$heroic_deb"
|
|
echo -e "${GREEN}Heroic Games Launcher installed.${NC}"
|
|
}
|