From b2afa7bd0c39cb8ef1f0c9935f1fa65468474610 Mon Sep 17 00:00:00 2001 From: Matt C Date: Fri, 14 May 2021 13:59:59 -0400 Subject: [PATCH] remove formatting from regular echo --- citrine.internal.sh | 10 +++++----- continue.sh | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/citrine.internal.sh b/citrine.internal.sh index 361cab4..36557b4 100755 --- a/citrine.internal.sh +++ b/citrine.internal.sh @@ -21,7 +21,7 @@ fi prompt "Do you need a keyboard layout other than standard US? (y/N)" KBD="$response" -inf "KBD=$response" +echo "KBD=$response" if [[ "$KBD" == "y" || "$KBD" == "Y" ]]; then prompt "We're going to show the list of keymaps in less. Do you know how to exit less? (Y/n)" UL="$response" @@ -33,7 +33,7 @@ if [[ "$KBD" == "y" || "$KBD" == "Y" ]]; then ls /usr/share/kbd/keymaps/**/*.map.gz | less prompt "Correct keymap (omit /usr/share/kbd/keymaps and the file extension)" KMP="$response" - inf "KMP=$response" + echo "KMP=$response" loadkeys ${KMP} fi @@ -43,7 +43,7 @@ inf "Disks:" fdisk -l | grep Disk | grep sectors --color=never prompt "Would you like to partition manually? (y/N)" -inf "PMODE=$response" +echo "PMODE=$response" PMODE="$response" MANUAL="no" @@ -52,7 +52,7 @@ if [[ "$PMODE" == "y" ]]; then MANUAL="yes" else prompt "Install target (will be WIPED COMPLETELY)" - inf "DISK=$response" + echo "DISK=$response" DISK="$response" if ! fdisk -l ${DISK}; then err "Seems like $DISK doesn't exist. Did you typo?" @@ -157,7 +157,7 @@ else read bash prompt "All set (and partitions mounted?) (y/N)" - inf "STAT=$response" + echo "STAT=$response" STAT="$response" if [[ "$STAT" == "y" ]]; then CONFDONE="YEP" diff --git a/continue.sh b/continue.sh index e5c8573..52dc87f 100755 --- a/continue.sh +++ b/continue.sh @@ -32,11 +32,13 @@ echo "LANG=en_US.UTF-8" > /etc/locale.conf clear prompt "Do you need more locales than just en_US? (y/N)" +echo "MORE=$response" MORE="$response" if [[ "$MORE" == "y" || "$MORE" == "Y" ]]; then prompt "Preferred editor" PGRM="$response" + echo "PGRM=$response" if [[ -x "$(command -v ${PGRM})" ]]; then inf "Attempting to install ${PGRM}" pacman -Sy ${PGRM} --noconfirm @@ -109,7 +111,7 @@ pacman-key --populate archlinux clear prompt "Would you like to install a DE/WM profile? (y/N)" -inf "DEP=$response" +echo "DEP=$response" DEP="$response" if [[ "$DEP" == "y" || "$DEP" == "Y" ]]; then @@ -132,7 +134,7 @@ if [[ "$DEP" == "y" || "$DEP" == "Y" ]]; then inf "(We'll add more as people ask)" inf "Please enter exactly as shown." prompt "" - inf "DE=$response" + echo "DE=$response" DE="$response" DM="" if [[ "$DE" == "Budgie" ]]; then @@ -187,7 +189,7 @@ if [[ "$DEP" == "y" || "$DEP" == "Y" ]]; then inf "- [blank] for none" prompt "" ND="$response" - inf "ND=$ND" + echo "ND=$ND" if [[ "$ND" != "" ]]; then inf "Ok, we'll install $ND" DM="$ND"