From a20e50f117f7067a4465f27999ccf60d6329f01e Mon Sep 17 00:00:00 2001 From: oddlama Date: Sun, 30 May 2021 02:33:45 +0200 Subject: [PATCH] Use ntp package instead of openntpd on arch; Fix set -u in dynamic case labels --- scripts/functions.sh | 10 +++++----- scripts/utils.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/functions.sh b/scripts/functions.sh index 58f2d96..1f8486e 100644 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -104,12 +104,12 @@ function add_summary_entry() { local ptr case "$id" in - "$DISK_ID_BIOS") ptr="← bios" ;; - "$DISK_ID_EFI") ptr="← efi" ;; - "$DISK_ID_SWAP") ptr="← swap" ;; - "$DISK_ID_ROOT") ptr="← root" ;; + "${DISK_ID_BIOS-__unused__}") ptr="← bios" ;; + "${DISK_ID_EFI-__unused__}") ptr="← efi" ;; + "${DISK_ID_SWAP-__unused__}") ptr="← swap" ;; + "${DISK_ID_ROOT-__unused__}") ptr="← root" ;; # \x1f characters compensate for printf byte count and unicode character count mismatch due to '←' - *) ptr="$(echo -e "\x1f\x1f")" ;; + *) ptr="$(echo -e "\x1f\x1f")" ;; esac summary_tree[$parent]+=";$id" diff --git a/scripts/utils.sh b/scripts/utils.sh index e219bea..f6386d0 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -338,7 +338,7 @@ function check_has_programs() { if type pacman &>/dev/null; then declare -A pacman_packages pacman_packages=( - [ntpd]=openntpd + [ntpd]=ntp [zfs]="" ) echo "We have detected that pacman is available."