remove formatting from regular echo

artix
Matt C 4 years ago
parent 90f76e201c
commit b2afa7bd0c

@ -21,7 +21,7 @@ fi
prompt "Do you need a keyboard layout other than standard US? (y/N)" prompt "Do you need a keyboard layout other than standard US? (y/N)"
KBD="$response" KBD="$response"
inf "KBD=$response" echo "KBD=$response"
if [[ "$KBD" == "y" || "$KBD" == "Y" ]]; then 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)" prompt "We're going to show the list of keymaps in less. Do you know how to exit less? (Y/n)"
UL="$response" UL="$response"
@ -33,7 +33,7 @@ if [[ "$KBD" == "y" || "$KBD" == "Y" ]]; then
ls /usr/share/kbd/keymaps/**/*.map.gz | less ls /usr/share/kbd/keymaps/**/*.map.gz | less
prompt "Correct keymap (omit /usr/share/kbd/keymaps and the file extension)" prompt "Correct keymap (omit /usr/share/kbd/keymaps and the file extension)"
KMP="$response" KMP="$response"
inf "KMP=$response" echo "KMP=$response"
loadkeys ${KMP} loadkeys ${KMP}
fi fi
@ -43,7 +43,7 @@ inf "Disks:"
fdisk -l | grep Disk | grep sectors --color=never fdisk -l | grep Disk | grep sectors --color=never
prompt "Would you like to partition manually? (y/N)" prompt "Would you like to partition manually? (y/N)"
inf "PMODE=$response" echo "PMODE=$response"
PMODE="$response" PMODE="$response"
MANUAL="no" MANUAL="no"
@ -52,7 +52,7 @@ if [[ "$PMODE" == "y" ]]; then
MANUAL="yes" MANUAL="yes"
else else
prompt "Install target (will be WIPED COMPLETELY)" prompt "Install target (will be WIPED COMPLETELY)"
inf "DISK=$response" echo "DISK=$response"
DISK="$response" DISK="$response"
if ! fdisk -l ${DISK}; then if ! fdisk -l ${DISK}; then
err "Seems like $DISK doesn't exist. Did you typo?" err "Seems like $DISK doesn't exist. Did you typo?"
@ -157,7 +157,7 @@ else
read read
bash bash
prompt "All set (and partitions mounted?) (y/N)" prompt "All set (and partitions mounted?) (y/N)"
inf "STAT=$response" echo "STAT=$response"
STAT="$response" STAT="$response"
if [[ "$STAT" == "y" ]]; then if [[ "$STAT" == "y" ]]; then
CONFDONE="YEP" CONFDONE="YEP"

@ -32,11 +32,13 @@ echo "LANG=en_US.UTF-8" > /etc/locale.conf
clear clear
prompt "Do you need more locales than just en_US? (y/N)" prompt "Do you need more locales than just en_US? (y/N)"
echo "MORE=$response"
MORE="$response" MORE="$response"
if [[ "$MORE" == "y" || "$MORE" == "Y" ]]; then if [[ "$MORE" == "y" || "$MORE" == "Y" ]]; then
prompt "Preferred editor" prompt "Preferred editor"
PGRM="$response" PGRM="$response"
echo "PGRM=$response"
if [[ -x "$(command -v ${PGRM})" ]]; then if [[ -x "$(command -v ${PGRM})" ]]; then
inf "Attempting to install ${PGRM}" inf "Attempting to install ${PGRM}"
pacman -Sy ${PGRM} --noconfirm pacman -Sy ${PGRM} --noconfirm
@ -109,7 +111,7 @@ pacman-key --populate archlinux
clear clear
prompt "Would you like to install a DE/WM profile? (y/N)" prompt "Would you like to install a DE/WM profile? (y/N)"
inf "DEP=$response" echo "DEP=$response"
DEP="$response" DEP="$response"
if [[ "$DEP" == "y" || "$DEP" == "Y" ]]; then 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 "(We'll add more as people ask)"
inf "Please enter exactly as shown." inf "Please enter exactly as shown."
prompt "" prompt ""
inf "DE=$response" echo "DE=$response"
DE="$response" DE="$response"
DM="" DM=""
if [[ "$DE" == "Budgie" ]]; then if [[ "$DE" == "Budgie" ]]; then
@ -187,7 +189,7 @@ if [[ "$DEP" == "y" || "$DEP" == "Y" ]]; then
inf "- [blank] for none" inf "- [blank] for none"
prompt "" prompt ""
ND="$response" ND="$response"
inf "ND=$ND" echo "ND=$ND"
if [[ "$ND" != "" ]]; then if [[ "$ND" != "" ]]; then
inf "Ok, we'll install $ND" inf "Ok, we'll install $ND"
DM="$ND" DM="$ND"

Loading…
Cancel
Save