From bb91f1a4c9c15f5cf275f800ca4c813028608737 Mon Sep 17 00:00:00 2001 From: Ceda EI Date: Sun, 12 May 2019 14:59:30 +0530 Subject: [PATCH] Fix colors. --- deploy.sh | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/deploy.sh b/deploy.sh index 6c867d3..72e4d36 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,31 +10,35 @@ function find_package_manager() { function install_package() { package_manager=$(find_package_manager) if [[ $? -ne 0 ]]; then - echo -e "\033[38;5;1mCould not find package manager" >&2 - exit + echo -e "\033[38;5;1mCould not find package manager\033[0;5;0m" >&2 + return 1 fi case $package_manager in pacman) sudo pacman -S $* + return $? ;; apt-get) sudo apt-get install $* + return $? ;; apk) sudo apk add $* + return $? ;; esac + return 2 } function check_and_install() { if hash $1 &> /dev/null; then - echo -e "\033[38;5;2m$1 is already installed." + echo -e "\033[38;5;2m$1 is already installed.\033[0;5;0m" else - echo -e "\033[38;5;2mInstalling $1." + echo -e "\033[38;5;2mInstalling $1.\033[0;5;0m" if install_package $1; then - echo -e "\033[38;5;2m$1 installed." + echo -e "\033[38;5;2m$1 installed.\033[0;5;0m" else - echo -e "\033[38;5;1mInstalling $1 failed." >&2 + echo -e "\033[38;5;1mInstalling $1 failed.\033[0;5;0m" >&2 fi fi } @@ -53,8 +57,8 @@ fi bd=$(dirname $0) cd "$bd" -echo -e "\033[38;5;2mBase Directory: $(pwd)\n" -echo -e "\033[38;5;2mInstalling packages\n" +echo -e "\033[38;5;2mBase Directory: $(pwd)\n\033[0;5;0m" +echo -e "\033[38;5;2mInstalling packages\n\033[0;5;0m" check_and_install stow check_and_install bash @@ -63,7 +67,7 @@ check_and_install vim check_and_install curl check_and_install git -echo -e "\n\033[38;5;2mStowing config\n" +echo -e "\n\033[38;5;2mStowing config\033[0;5;0m\n" mv ~/.bashrc{,.old} &> /dev/null stow_cfg bash @@ -76,18 +80,18 @@ mv ~/.vimrc{,.old} &> /dev/null mv ~/.vim{,.old} &> /dev/null stow_cfg vim -echo -e "\n\033[38;5;2mSetting up wish\n" +echo -e "\n\033[38;5;2mSetting up wish\033[0;5;0m\n" mkdir -p ~/.config/ git clone https://gitlab.com/ceda_ei/wish.git ~/.config/wish -echo -e "\n\033[38;5;2mSetting up tmux plugins\n" +echo -e "\n\033[38;5;2mSetting up tmux plugins\033[0;5;0m\n" mkdir -p ~/.tmux/plugins/ git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm ~/.tmux/plugins/tpm/bin/install_plugins -echo -e "\n\033[38;5;2mSetting up vim plugins\n" +echo -e "\n\033[38;5;2mSetting up vim plugins\033[0;5;0m\n" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim vim +PlugInstall +qall -echo -e "\n\033[38;5;2mComplete\n" +echo -e "\n\033[38;5;2mComplete\033[0;5;0m\n"