From 48b9cdbfdbb2f491518816b12d0acf63be128956 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Sun, 26 Dec 2021 00:14:36 -0300 Subject: [PATCH] Replace dialog with whiptail --- scripts/bootstrap.sh | 28 ++++++++++++++-------------- scripts/install.sh | 21 +++++++++------------ 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 75225cb..7260a60 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,33 +1,33 @@ #!/bin/sh getGitconfigData() { - dialog --stdout --yesno "Would you like to set up gitconfig?" 10 60 + whiptail --yesno "Would you like to set up gitconfig?" 0 0 if [ $? -eq 1 ]; then return fi - dialog --msgbox "Now, I will ask you for data to set up gitconfig personal account." 10 60 - gitPersonalName=$(dialog --inputbox "Enter a name." 10 60 3>&1 1>&2 2>&3 3>&1) - gitPersonalMail=$(dialog --inputbox "Enter a mail." 10 60 3>&1 1>&2 2>&3 3>&1) + whiptail --msgbox "Now, I will ask you for data to set up gitconfig personal account." 10 60 + gitPersonalName=$(whiptail --inputbox "Enter a name." 0 0 3>&1 1>&2 2>&3) + gitPersonalMail=$(whiptail --inputbox "Enter an e-mail." 0 0 3>&1 1>&2 2>&3) - dialog --msgbox "Let's continue with the work account." 10 60 - gitWorkPath=$(dialog --inputbox "Enter a folder (absolute) path where you would like to use the work account." 10 60 3>&1 1>&2 2>&3 3>&1) + whiptail --msgbox "Let's continue with the work account." 0 0 + gitWorkPath=$(whiptail --inputbox "Enter an absolute folder path where you would like to use the work account." 0 0 3>&1 1>&2 2>&3) while [[ ! -d $gitWorkPath ]]; do - gitWorkPath=$(dialog --no-cancel --inputbox "Path isn't valid. Please try again" 10 60 3>&1 1>&2 2>&3 3>&1) + gitWorkPath=$(whiptail --no-cancel --inputbox "Path isn't valid. Please try again" 0 0 3>&1 1>&2 2>&3) done - gitWorkName=$(dialog --inputbox "Enter a name." 10 60 3>&1 1>&2 2>&3 3>&1) - gitWorkMail=$(dialog --inputbox "Enter a mail." 10 60 3>&1 1>&2 2>&3 3>&1) + gitWorkName=$(whiptail --inputbox "Enter a name." 0 0 3>&1 1>&2 2>&3) + gitWorkMail=$(whiptail --inputbox "Enter an e-mail." 0 0 3>&1 1>&2 2>&3) sed -e "s/PERSONAL_NAME/$gitPersonalName/g" -e "s/PERSONAL_MAIL/$gitPersonalMail/g" -e "s|WORK_PATH|${gitWorkPath}|g" ./templates/.gitconfig > ./dotfiles/.gitconfig sed -e "s/WORK_NAME/$gitWorkName/g" -e "s/WORK_MAIL/$gitWorkMail/g" ./templates/.gitconfig-work > ./dotfiles/.gitconfig-work } checkForDependencies() { - commOuput=$(command -v dialog &> /dev/null) + commOuput=$(command -v whiptail &> /dev/null) if [ $? -eq 1 ]; then unameOutput=$(uname -a | grep "arch") if [ -f "/etc/arch-release" ] || [ $unameOutput -eq 0 ]; then - sudo pacman --noconfirm --needed -Sy dialog > /dev/null 2>&1 + sudo pacman --noconfirm --needed -Sy libnewt > /dev/null 2>&1 if [ $? -eq 1 ]; then echo "You must have an active internet connection." >&2 exit 1 @@ -36,7 +36,7 @@ checkForDependencies() { return fi - echo "You must install dialog." >&2 + echo "You must install libnewt." >&2 exit 1 fi } @@ -48,11 +48,11 @@ startRice() { cocoRiceFolder=$(echo "$(pwd -P)" | awk '{ sub(/CocoRice.*/, "CocoRice"); print }') cd $cocoRiceFolder - dialog --title "CocoRice" --msgbox "Hi! This script will auto install my dotfiles. Make sure to backup your dotfiles!" 10 60 + whiptail --title "CocoRice" --msgbox "Hi! This script will auto install my dotfiles." 0 0 getGitconfigData sh scripts/linkFiles.sh sh scripts/install.sh - dialog --title "CocoRice" --msgbox "All done! Enjoy..." 10 60 + whiptail --title "CocoRice" --msgbox "All done! Enjoy..." 0 0 clear cd $lastFolder diff --git a/scripts/install.sh b/scripts/install.sh index cd78e29..d22cfab 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,9 +1,10 @@ #!/bin/sh -makeInstall() { - cd $1 - sudo make install - cd .. +cloneAndMake() { + # git clone --progress $2 2>&1 | dialog --progressbox "Downloading ${1}" 0 0 + whiptail "Downloading ${1}" 0 0 + git clone $2 2>&1 + cd $1; sudo make install; cd .. } downloadAndInstallPackages() { @@ -12,20 +13,16 @@ downloadAndInstallPackages() { cd $DOTFILES_CONFIG if [[ ! -d "dwmblocks" ]]; then - git clone --progress https://github.com/santilococo/dwmblocks.git 2>&1 | dialog --progressbox "Downloading dwmblocks" 10 60 - makeInstall "dwmblocks" + cloneAndMake "dwmblocks" "https://github.com/santilococo/dwmblocks.git" fi if [[ ! -d "dwm" ]]; then - git clone --progress https://github.com/santilococo/dwm.git 2>&1 | dialog --progressbox "Downloading dwm" 10 60 - makeInstall "dwm" + cloneAndMake "dwm" "https://github.com/santilococo/dwm.git" fi if [[ ! -d "st" ]]; then - git clone --progress https://github.com/santilococo/st.git 2>&1 | dialog --progressbox "Downloading st" 10 60 - makeInstall "st" + cloneAndMake "st" "https://github.com/santilococo/st.git" fi if [[ ! -d "dmenu" ]]; then - git clone --progress https://github.com/santilococo/dmenu.git 2>&1 | dialog --progressbox "Downloading dmenu" 10 60 - makeInstall "dmenu" + cloneAndMake "dmenu" "https://github.com/santilococo/dmenu.git" fi }