From 2621bdf0e4b34486e038b70bc4b6a0b01ca79431 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 29 Nov 2022 14:55:34 +0100 Subject: [PATCH] add ... to messages --- usr/lib/archboot/installer/autoprepare.sh | 12 ++++++------ usr/lib/archboot/installer/mountpoints.sh | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/usr/lib/archboot/installer/autoprepare.sh b/usr/lib/archboot/installer/autoprepare.sh index e26bdc404..bacf9501b 100644 --- a/usr/lib/archboot/installer/autoprepare.sh +++ b/usr/lib/archboot/installer/autoprepare.sh @@ -48,7 +48,7 @@ autoprepare() { fi if [[ "${UEFISYS_MOUNTPOINT}" == "/boot" ]]; then - DIALOG --msgbox "You have chosen to use /boot as the UEFISYS Mountpoint. The minimum partition size is 260 MiB and only FAT32 FS is supported" 0 0 + DIALOG --msgbox "You have chosen to use /boot as the UEFISYS Mountpoint. The minimum partition size is 260 MiB and only FAT32 FS is supported." 0 0 _UEFISYS_BOOTPART="1" fi @@ -203,13 +203,13 @@ autoprepare() { # validate DEVICE if [[ ! -b "${DEVICE}" ]]; then - DIALOG --msgbox "Device '${DEVICE}' is not valid" 0 0 + DIALOG --msgbox "Error: Device '${DEVICE}' is not valid." 0 0 return 1 fi # validate DEST if [[ ! -d "${DESTDIR}" ]]; then - DIALOG --msgbox "Destination directory '${DESTDIR}' is not valid" 0 0 + DIALOG --msgbox "Error: Destination directory '${DESTDIR}' is not valid." 0 0 return 1 fi @@ -269,7 +269,7 @@ autoprepare() { fi #shellcheck disable=SC2181 if [[ $? -gt 0 ]]; then - DIALOG --msgbox "Error partitioning ${DEVICE} (see ${LOG} for details)" 0 0 + DIALOG --msgbox "Error: Partitioning ${DEVICE} (see ${LOG} for details)." 0 0 printk on return 1 fi @@ -332,9 +332,9 @@ autoprepare() { fi BTRFS_LEVEL="NONE" if ! [[ "${FSTYPE}" = "swap" ]]; then - DIALOG --infobox "Creating ${FSTYPE} on ${PART}\nwith FSLABEL ${LABEL_NAME} ,\nmounting to ${DESTDIR}${MP}" 0 0 + DIALOG --infobox "Creating ${FSTYPE} on ${PART}\nwith FSLABEL ${LABEL_NAME} ,\nmounting to ${DESTDIR}${MP} ..." 0 0 else - DIALOG --infobox "Creating and activating swapspace on ${PART}" 0 0 + DIALOG --infobox "Creating and activating swapspace on ${PART} ..." 0 0 fi _mkfs "${DOMKFS}" "${PART}" "${FSTYPE}" "${DESTDIR}" "${MP}" "${LABEL_NAME}" "${FS_OPTIONS}" "${BTRFS_DEVICES}" ${BTRFS_LEVEL} ${BTRFS_SUBVOLUME} ${DOSUBVOLUME} ${BTRFS_COMPRESS} || return 1 sleep 1 diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh index b47de443e..6f66cbab9 100644 --- a/usr/lib/archboot/installer/mountpoints.sh +++ b/usr/lib/archboot/installer/mountpoints.sh @@ -234,16 +234,16 @@ mountpoints() { BTRFS_COMPRESS=$(echo "${line}" | cut -d: -f 11) if [[ "${DOMKFS}" = "yes" ]]; then if [[ "${FSTYPE}" = "swap" ]]; then - DIALOG --infobox "Creating and activating swapspace on ${PART}" 0 0 + DIALOG --infobox "Creating and activating swapspace on ${PART} ..." 0 0 else - DIALOG --infobox "Creating ${FSTYPE} on ${PART},\nmounting to ${DESTDIR}${MP}" 0 0 + DIALOG --infobox "Creating ${FSTYPE} on ${PART},\nmounting to ${DESTDIR}${MP} ..." 0 0 fi _mkfs yes "${PART}" "${FSTYPE}" "${DESTDIR}" "${MP}" "${LABEL_NAME}" "${FS_OPTIONS}" "${BTRFS_DEVICES}" "${BTRFS_LEVEL}" "${BTRFS_SUBVOLUME}" "${DOSUBVOLUME}" "${BTRFS_COMPRESS}" || return 1 else if [[ "${FSTYPE}" = "swap" ]]; then - DIALOG --infobox "Activating swapspace on ${PART}" 0 0 + DIALOG --infobox "Activating swapspace on ${PART} ..." 0 0 else - DIALOG --infobox "Mounting ${FSTYPE} on ${PART} to ${DESTDIR}${MP}" 0 0 + DIALOG --infobox "Mounting ${FSTYPE} on ${PART} to ${DESTDIR}${MP} ..." 0 0 fi _mkfs no "${PART}" "${FSTYPE}" "${DESTDIR}" "${MP}" "${LABEL_NAME}" "${FS_OPTIONS}" "${BTRFS_DEVICES}" "${BTRFS_LEVEL}" "${BTRFS_SUBVOLUME}" "${DOSUBVOLUME}" "${BTRFS_COMPRESS}" || return 1 fi