spalencsar/nas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unbound DISTRO_NAME variable in installation summary

Browse Source 
- Added DISTRO_NAME variable to detect_distro function using PRETTY_NAME from /etc/os-release
- Export DISTRO_NAME for use in show_installation_summary function
- Prevent 'unbound variable' error when creating services summary file
This commit is contained in:
Mărcziem ™
2025-10-03 13:50:35 +02:00
parent 3c9fe4017b
commit f95a843b4c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup.sh
View File

@@ -118,6 +118,7 @@ detect_distro() {
detected_distro=${ID,,} # Convert to lowercase detected_distro=${ID,,} # Convert to lowercase
detected_version=$VERSION_ID detected_version=$VERSION_ID
detected_codename=${VERSION_CODENAME:-${UBUNTU_CODENAME:-""}} detected_codename=${VERSION_CODENAME:-${UBUNTU_CODENAME:-""}}
detected_pretty_name=$PRETTY_NAME
detection_method="/etc/os-release" detection_method="/etc/os-release"
log_debug "Detected via /etc/os-release: $PRETTY_NAME" log_debug "Detected via /etc/os-release: $PRETTY_NAME"
fi fi
@@ -213,6 +214,7 @@ detect_distro() {
# Parse and normalize version # Parse and normalize version
DISTRO_VERSION=$(normalize_version "$detected_version") DISTRO_VERSION=$(normalize_version "$detected_version")
DISTRO_CODENAME=$detected_codename DISTRO_CODENAME=$detected_codename
DISTRO_NAME=${detected_pretty_name:-$DISTRO}
log_info "Distribution detected: $DISTRO $DISTRO_VERSION ($detection_method)" log_info "Distribution detected: $DISTRO $DISTRO_VERSION ($detection_method)"
if [[ -n "$DISTRO_CODENAME" ]]; then if [[ -n "$DISTRO_CODENAME" ]]; then
@@ -237,6 +239,7 @@ detect_distro() {
export DISTRO DETECTED_DISTRO=$DISTRO export DISTRO DETECTED_DISTRO=$DISTRO
export DISTRO_VERSION DETECTED_VERSION=$DISTRO_VERSION export DISTRO_VERSION DETECTED_VERSION=$DISTRO_VERSION
export DISTRO_CODENAME DETECTED_CODENAME=$DISTRO_CODENAME export DISTRO_CODENAME DETECTED_CODENAME=$DISTRO_CODENAME
export DISTRO_NAME
} }
# System requirements check # System requirements check