diff --git a/quickz.sh b/quickz.sh index 9bcdbd6..e0c9f47 100755 --- a/quickz.sh +++ b/quickz.sh @@ -1,55 +1,55 @@ #!/bin/bash if command -v zsh &> /dev/null && command -v git &> /dev/null && command -v wget &> /dev/null; then - echo -e "ZSH and Git are already installed\n" + echo -e "ZSH and Git are already installed\n" else - if sudo apt install -y zsh git wget || sudo dnf install -y zsh git wget || sudo yum install -y zsh git wget || sudo brew install git zsh wget ; then - echo -e "ZSH and Git Installed\n" - else - echo -e "Can't install ZSH or Git\n" && exit - fi + if sudo apt install -y zsh git wget || sudo dnf install -y zsh git wget || sudo yum install -y zsh git wget || sudo brew install git zsh wget ; then + echo -e "ZSH and Git Installed\n" + else + echo -e "Can't install ZSH or Git\n" && exit + fi fi -if mv -n ~/.zshrc ~/.zshrc-backup-$(date +"%Y-%m-%d"); then # backup .zshrc - echo -e "Backed up the current .zshrc to .zshrc-backup-date\n" +if mv -n ~/.zshrc ~/.zshrc-backup-$(date +"%Y-%m-%d"); then # backup .zshrc + echo -e "Backed up the current .zshrc to .zshrc-backup-date\n" fi echo -e "Installing oh-my-zsh\n" if [ -d ~/.oh-my-zsh ]; then - echo -e "oh-my-zsh is already installed" + echo -e "oh-my-zsh is already installed" else - git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh + git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh fi cp -f .zshrc ~/ -mkdir ~/.quickzsh # external plugins, things, will be instlled in here +mkdir -p ~/.quickzsh # external plugins, things, will be instlled in here if [ -d ~/.oh-my-zsh/plugins/zsh-autosuggestions ]; then - cd ~/.oh-my-zsh/plugins/zsh-autosuggestions && git pull + cd ~/.oh-my-zsh/plugins/zsh-autosuggestions && git pull else - git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/plugins/zsh-autosuggestions + git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/plugins/zsh-autosuggestions fi if [ -d ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting ]; then - cd ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting && git pull + cd ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting && git pull else - git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting + git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting fi if [ -d ~/.oh-my-zsh/custom/plugins/zsh-completions]; then - cd ~/.oh-my-zsh/custom/plugins/zsh-completions && git pull + cd ~/.oh-my-zsh/custom/plugins/zsh-completions && git pull else - git clone --depth=1 https://github.com/zsh-users/zsh-completions ~/.oh-my-zsh/custom/plugins/zsh-completions + git clone --depth=1 https://github.com/zsh-users/zsh-completions ~/.oh-my-zsh/custom/plugins/zsh-completions fi if [ -d ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search ]; then - cd ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search && git pull + cd ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search && git pull else - git clone --depth=1 https://github.com/zsh-users/zsh-history-substring-search ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search + git clone --depth=1 https://github.com/zsh-users/zsh-history-substring-search ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search fi @@ -64,53 +64,53 @@ wget -N https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/DejaVuS fc-cache -fv ~/.fonts if [ -d ~/.oh-my-zsh/custom/themes/powerlevel10k ]; then - cd ~/.oh-my-zsh/custom/themes/powerlevel10k && git pull + cd ~/.oh-my-zsh/custom/themes/powerlevel10k && git pull else - git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/.oh-my-zsh/custom/themes/powerlevel10k + git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/.oh-my-zsh/custom/themes/powerlevel10k fi if [ -d ~/.quickzsh/fzf ]; then - cd ~/.quickzsh/fzf && git pull - ~/.quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64 + cd ~/.quickzsh/fzf && git pull + ~/.quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64 else - git clone --depth 1 https://github.com/junegunn/fzf.git ~/.quickzsh/fzf - ~/.quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64 + git clone --depth 1 https://github.com/junegunn/fzf.git ~/.quickzsh/fzf + ~/.quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64 fi if [ -d ~/.oh-my-zsh/custom/plugins/k ]; then - cd ~/.oh-my-zsh/custom/plugins/k && git pull + cd ~/.oh-my-zsh/custom/plugins/k && git pull else - git clone --depth 1 https://github.com/supercrabtree/k ~/.oh-my-zsh/custom/plugins/k; then : + git clone --depth 1 https://github.com/supercrabtree/k ~/.oh-my-zsh/custom/plugins/k; then : fi if [ -d ~/.quickzsh/marker ]; then - cd ~/.quickzsh/marker && git pull + cd ~/.quickzsh/marker && git pull else - git clone --depth 1 https://github.com/pindexis/marker ~/.quickzsh/marker; then : + git clone --depth 1 https://github.com/pindexis/marker ~/.quickzsh/marker; then : fi if ~/.quickzsh/marker/install.py; then - echo -e "Installed Marker\n" + echo -e "Installed Marker\n" else - echo -e "Marker Installation Had Issues\n" + echo -e "Marker Installation Had Issues\n" fi # if git clone --depth 1 https://github.com/todotxt/todo.txt-cli.git ~/.quickzsh/todo; then : # else -# cd ~/.quickzsh/todo && git fetch --all && git reset --hard origin/master +# cd ~/.quickzsh/todo && git fetch --all && git reset --hard origin/master # fi # mkdir ~/.quickzsh/todo/bin ; cp -f ~/.quickzsh/todo/todo.sh ~/.quickzsh/todo/bin/todo.sh # cp todo.sh to ./bin so only it is included in $PATH -# #touch ~/.todo/config # needs it, otherwise spits error , yeah a bug in todo +# #touch ~/.todo/config # needs it, otherwise spits error , yeah a bug in todo # ln -s ~/.quickzsh/todo ~/.todo if [ ! -L ~/.quickzsh/todo/bin/todo.sh ]; then echo -e "Installing todo.sh in ~/.quickzsh/todo\n" - mkdir -p ~/.quickzsh/todo/bin - wget "https://github.com/todotxt/todo.txt-cli/releases/download/v2.11.0/todo.txt_cli-2.11.0.tar.gz" -P ~/.quickzsh/ - tar xvf ~/.quickzsh/todo.txt_cli-2.11.0.tar.gz -C ~/.quickzsh/todo --strip 1 && rm ~/.quickzsh/todo.txt_cli-2.11.0.tar.gz - ln -s ~/.quickzsh/todo/todo.sh ~/.quickzsh/todo/bin/todo.sh # so only .../bin is included in $PATH - ln -s ~/.quickzsh/todo/todo.cfg ~/.todo.cfg # it expects it there or ~/todo.cfg or ~/.todo/config + mkdir -p ~/.quickzsh/todo/bin + wget "https://github.com/todotxt/todo.txt-cli/releases/download/v2.11.0/todo.txt_cli-2.11.0.tar.gz" -P ~/.quickzsh/ + tar xvf ~/.quickzsh/todo.txt_cli-2.11.0.tar.gz -C ~/.quickzsh/todo --strip 1 && rm ~/.quickzsh/todo.txt_cli-2.11.0.tar.gz + ln -s ~/.quickzsh/todo/todo.sh ~/.quickzsh/todo/bin/todo.sh # so only .../bin is included in $PATH + ln -s ~/.quickzsh/todo/todo.cfg ~/.todo.cfg # it expects it there or ~/todo.cfg or ~/.todo/config else - echo -e "todo.sh is already instlled in ~/.quickzsh/todo/bin/\n" + echo -e "todo.sh is already instlled in ~/.quickzsh/todo/bin/\n" fi if [[ $1 == "--cp-hist" ]] || [ $1 == "-c" ]; then @@ -119,12 +119,12 @@ if [[ $1 == "--cp-hist" ]] || [ $1 == "-c" ]; then wget https://gist.githubusercontent.com/muendelezaji/c14722ab66b505a49861b8a74e52b274/raw/49f0fb7f661bdf794742257f58950d209dd6cb62/bash-to-zsh-hist.py cat ~/.bash_history | python bash-to-zsh-hist.py >> ~/.zsh_history else - if command -v python3 &>/dev/null; then - wget https://gist.githubusercontent.com/muendelezaji/c14722ab66b505a49861b8a74e52b274/raw/49f0fb7f661bdf794742257f58950d209dd6cb62/bash-to-zsh-hist.py - cat ~/.bash_history | python3 bash-to-zsh-hist.py >> ~/.zsh_history - else - echo "Python is not installed, can't copy bash_history to zsh_history\n" - fi + if command -v python3 &>/dev/null; then + wget https://gist.githubusercontent.com/muendelezaji/c14722ab66b505a49861b8a74e52b274/raw/49f0fb7f661bdf794742257f58950d209dd6cb62/bash-to-zsh-hist.py + cat ~/.bash_history | python3 bash-to-zsh-hist.py >> ~/.zsh_history + else + echo "Python is not installed, can't copy bash_history to zsh_history\n" + fi fi else echo -e "\nNot copying bash_history to zsh_history, as --cp-hist or -c is not supplied\n" @@ -135,8 +135,8 @@ fi echo -e "\nSudo access is needed to change default shell\n" if chsh -s $(which zsh) && /bin/zsh -i -c upgrade_oh_my_zsh; then - echo -e "Installation Successful, exit terminal and enter a new session" + echo -e "Installation Successful, exit terminal and enter a new session" else - echo -e "Something is wrong" + echo -e "Something is wrong" fi exit