From b44cb1b9701f7710fa2df9c10c5d4f83f9d58fa0 Mon Sep 17 00:00:00 2001
From: Plaza521 <alex_platonov1@mail.ru>
Date: Fri, 27 Oct 2023 21:18:58 +0300
Subject: [PATCH] Some refactor

- Change way to show commands from set -x to function that shows command
  and then executes it
- Now it tries to find ~/.oh-my-zsh/oh-my-zsh.sh before reinstalling
- Now it installs git repos with --depth 1 and removes .git folders
---
 install_zsh.sh | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/install_zsh.sh b/install_zsh.sh
index eceb2a5..747e87a 100644
--- a/install_zsh.sh
+++ b/install_zsh.sh
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+function showcom()
+{
+    echo "- ${@/eval/}"
+    "$@"
+}
+
 # Check if necessary things are installed
 if [ ! command -v git &> /dev/null ] || [ ! command -v zsh &> /dev/null ]; then
     echo "This script requires git and zsh"
@@ -7,16 +13,20 @@ if [ ! command -v git &> /dev/null ] || [ ! command -v zsh &> /dev/null ]; then
 fi
 
 # Asking if user really want to install
-read -p 'This script will replace ~/.zshrc and ~/.oh-my-zsh with its own. If you still want to run it, type "y": ' -n 1 -r
+read -p 'This script will replace ~/.zshrc with its own. If you still want to run it, type "y": ' -n 1 -r
 echo
 if [[ ! $REPLY =~ ^[Yy]$ ]]; then
     exit 1
 fi
 
-# Installing
-set -x
-rm -rf ~/.oh-my-zsh
-git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh > /dev/null 2>&1
-git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting > /dev/null 2>&1
-wget -O ~/.zshrc https://nakidai.ddns.net/nakidai/dotfiles/raw/branch/master/zsh/.zshrc > /dev/null 2>&1
-wget -O ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/headline.zsh-theme https://nakidai.ddns.net/nakidai/dotfiles/raw/branch/master/zsh/headline.zsh-theme > /dev/null 2>&1
+echo "Installing..."
+if ! test -f ~/.oh-my-zsh/oh-my-zsh.sh; then
+    showcom eval "rm -rf ~/.oh-my-zsh"
+    showcom eval "git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh --depth 1 > /dev/null 2>&1"
+    showcom eval "rm -rf ~/.oh-my-zsh/.git"
+fi
+showcom eval "git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting --depth 1 > /dev/null 2>&1"
+showcom eval "rm -rf ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting/.git"
+showcom eval "wget -O ~/.zshrc https://nakidai.ddns.net/nakidai/dotfiles/raw/branch/master/zsh/.zshrc > /dev/null 2>&1"
+showcom eval "wget -O ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/headline.zsh-theme https://nakidai.ddns.net/nakidai/dotfiles/raw/branch/master/zsh/headline.zsh-theme > /dev/null 2>&1"
+echo "Done"