diff --git a/brew/Brewfile b/brew/Brewfile index 66c2585..37b6fb8 100644 --- a/brew/Brewfile +++ b/brew/Brewfile @@ -42,7 +42,7 @@ brew "pyenv" cask "visual-studio-code" cask "firefox-developer-edition" cask "google-chrome" -cask "beekeeper-studio" +# cask "beekeeper-studio" cask "figma" cask "postman" diff --git a/install.sh b/install.sh index 79ae7ad..943093e 100644 --- a/install.sh +++ b/install.sh @@ -7,14 +7,17 @@ set -e TOTAL_STEPS=7 STEP=1 function step_msg { - printf "\n\033[36;1m[%s/%s] %s...\033[0m\n" "$STEP" "$TOTAL_STEPS" "$1"; + printf "\033[36;1m[%s/%s] %s...\n\033[0m" "$STEP" "$TOTAL_STEPS" "$1"; ((STEP++)) } function title_msg { - printf "\n%s\n" "$1"; + printf "\n\033[35;1m%s\n\n" "$1"; } +# -- Getting Started ---------------------------------------------------------- +title_msg "This script will install your workspace." + # -- Get some information ----------------------------------------------------- if [ "$CI" = true ] ; then GIT_EMAIL=name@mail.com @@ -23,7 +26,7 @@ else read -r -p "What is your email? " GIT_EMAIL fi -title_msg "Please wait! It will configure your environment." +title_msg "Please wait! It will configure your workspace." # -- Project folder ----------------------------------------------------------- step_msg "Creating the Projects folder" @@ -31,11 +34,11 @@ mkdir ~/Projects # -- Dependencies ------------------------------------------------------------- step_msg "Installing dependencies" -brew install git stow +brew install git stow 1> /dev/null # -- Dotfiles ----------------------------------------------------------------- step_msg "Setting up dotfiles" -git clone https://github.com/YasminTeles/dotfiles.git ~/.dotfiles +git clone https://github.com/YasminTeles/dotfiles.git ~/.dotfiles 1> /dev/null rm -rf ~/.gitconfig cd ~/.dotfiles @@ -47,7 +50,7 @@ brew bundle install --file=~/Brewfile # -- Oh My Zsh ----------------------------------------------------------------- step_msg "Installing the Oh My Zsh" -sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended +sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended 1> /dev/null rm -rf ~/.zshrc stow --dotfiles zsh echo "My current shell is $SHELL." @@ -59,7 +62,7 @@ git config --global user.email "$GIT_EMAIL" # -- SSH Key ------------------------------------------------------------------- step_msg "Generating a new SSH key" rm -rf ~/.ssh/id_ed25519 ~/.ssh/id_ed25519.pub -ssh-keygen -t ed25519 -C "$GIT_EMAIL" -f ~/.ssh/id_ed25519 -q -N "" +ssh-keygen -t ed25519 -C "$GIT_EMAIL" -f ~/.ssh/id_ed25519 -q -N "" 1> /dev/null eval "$(ssh-agent -s)" ssh-add ~/.ssh/id_ed25519 @@ -70,5 +73,5 @@ echo -e "- Run \033[1mmake ssh\033[0m to copy your SSH public Key and past it in echo -e "- Run \033[1mmake zsh\033[0m to change your shell to zsh mode." # -- Happy end ----------------------------------------------------------------- -printf "\n\nSuccess: Everything is ready!" -printf "\nHave a nice day!\n" +title_msg "Everything is ready!" +title_msg "Have a nice day!" diff --git a/uninstall.sh b/uninstall.sh index 31cc176..62e1761 100644 --- a/uninstall.sh +++ b/uninstall.sh @@ -11,7 +11,11 @@ function step_msg { ((STEP++)) } -echo "This script will remove all configurations of the environment." +function title_msg { + printf "\n\033[35;1m%s\n\n" "$1"; +} + +title_msg "This script will remove your workspace." if [ ! "$CI" ] then @@ -20,7 +24,7 @@ fi if [[ "$CI" || "$CONFIRM" == [yY] || "$CONFIRM" == [yY][eE][sS] ]] then - printf "\nPlease wait! Proceeding with the removal of all configurations...\n" + title_msg "Please wait! Proceeding to remove your workspace..." # -- Symlinks ---------------------------------------------------------------- step_msg "Removing all symlinks" @@ -45,11 +49,11 @@ then rm -rf ~/.dotfiles # -- Happy end ----------------------------------------------------------------- - printf "\nAll configurations have been removed." + title_msg "The workspace have been removed." else printf "\nOperation cancelled." fi -printf "\nHave a nice day!\n" +title_msg "Have a nice day!"