slococo
/
sadedot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace dialog with whiptail

This commit is contained in:
Santiago Lo Coco 2021-12-26 00:14:36 -03:00
parent f01120bdd5
commit 48b9cdbfdb
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/bootstrap.sh
View File

@ -1,33 +1,33 @@
#!/bin/sh #!/bin/sh
getGitconfigData() { 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 if [ $? -eq 1 ]; then
return return
fi fi
dialog --msgbox "Now, I will ask you for data to set up gitconfig personal account." 10 60 whiptail --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) gitPersonalName=$(whiptail --inputbox "Enter a name." 0 0 3>&1 1>&2 2>&3)
gitPersonalMail=$(dialog --inputbox "Enter a mail." 10 60 3>&1 1>&2 2>&3 3>&1) 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 whiptail --msgbox "Let's continue with the work account." 0 0
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) 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 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 done
gitWorkName=$(dialog --inputbox "Enter a name." 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=$(dialog --inputbox "Enter a mail." 10 60 3>&1 1>&2 2>&3 3>&1) 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/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 sed -e "s/WORK_NAME/$gitWorkName/g" -e "s/WORK_MAIL/$gitWorkMail/g" ./templates/.gitconfig-work > ./dotfiles/.gitconfig-work
} }
checkForDependencies() { checkForDependencies() {
commOuput=$(command -v dialog &> /dev/null) commOuput=$(command -v whiptail &> /dev/null)
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
unameOutput=$(uname -a | grep "arch") unameOutput=$(uname -a | grep "arch")
if [ -f "/etc/arch-release" ] || [ $unameOutput -eq 0 ]; then 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 if [ $? -eq 1 ]; then
echo "You must have an active internet connection." >&2 echo "You must have an active internet connection." >&2
exit 1 exit 1
@ -36,7 +36,7 @@ checkForDependencies() {
return return
fi fi
echo "You must install dialog." >&2 echo "You must install libnewt." >&2
exit 1 exit 1
fi fi
} }
@ -48,11 +48,11 @@ startRice() {
cocoRiceFolder=$(echo "$(pwd -P)" | awk '{ sub(/CocoRice.*/, "CocoRice"); print }') cocoRiceFolder=$(echo "$(pwd -P)" | awk '{ sub(/CocoRice.*/, "CocoRice"); print }')
cd $cocoRiceFolder 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 getGitconfigData
sh scripts/linkFiles.sh sh scripts/linkFiles.sh
sh scripts/install.sh sh scripts/install.sh
dialog --title "CocoRice" --msgbox "All done! Enjoy..." 10 60 whiptail --title "CocoRice" --msgbox "All done! Enjoy..." 0 0
clear clear
cd $lastFolder cd $lastFolder

21
scripts/install.sh
View File

@ -1,9 +1,10 @@
#!/bin/sh #!/bin/sh
makeInstall() { cloneAndMake() {
cd $1 # git clone --progress $2 2>&1 | dialog --progressbox "Downloading ${1}" 0 0
sudo make install whiptail "Downloading ${1}" 0 0
cd .. git clone $2 2>&1
cd $1; sudo make install; cd ..
} }
downloadAndInstallPackages() { downloadAndInstallPackages() {
@ -12,20 +13,16 @@ downloadAndInstallPackages() {
cd $DOTFILES_CONFIG cd $DOTFILES_CONFIG
if [[ ! -d "dwmblocks" ]]; then if [[ ! -d "dwmblocks" ]]; then
git clone --progress https://github.com/santilococo/dwmblocks.git 2>&1 | dialog --progressbox "Downloading dwmblocks" 10 60 cloneAndMake "dwmblocks" "https://github.com/santilococo/dwmblocks.git"
makeInstall "dwmblocks"
fi fi
if [[ ! -d "dwm" ]]; then if [[ ! -d "dwm" ]]; then
git clone --progress https://github.com/santilococo/dwm.git 2>&1 | dialog --progressbox "Downloading dwm" 10 60 cloneAndMake "dwm" "https://github.com/santilococo/dwm.git"
makeInstall "dwm"
fi fi
if [[ ! -d "st" ]]; then if [[ ! -d "st" ]]; then
git clone --progress https://github.com/santilococo/st.git 2>&1 | dialog --progressbox "Downloading st" 10 60 cloneAndMake "st" "https://github.com/santilococo/st.git"
makeInstall "st"
fi fi
if [[ ! -d "dmenu" ]]; then if [[ ! -d "dmenu" ]]; then
git clone --progress https://github.com/santilococo/dmenu.git 2>&1 | dialog --progressbox "Downloading dmenu" 10 60 cloneAndMake "dmenu" "https://github.com/santilococo/dmenu.git"
makeInstall "dmenu"
fi fi
} }