test-

install-scripts/zsh.sh

@@ -1,23 +1,14 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# zsh and oh my zsh including pokemon-color-scripts#
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
-
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
-
-# Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_zsh.log"
+zsh=(
+zsh
+zsh-completions
+)
 
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
-
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 # Determine the directory where the script is located
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -25,47 +16,33 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PARENT_DIR="$SCRIPT_DIR/.."
 cd "$PARENT_DIR" || exit 1
 
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 
-ISAUR=$(command -v yay || command -v paru)
-
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if $ISAUR -Q "$1" &>> /dev/null ; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if $ISAUR -Q "$1" &>> /dev/null ; then
-      echo -e "\e[1A\e[K${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
-      exit 1
-    fi
-  fi
-}
-
-
-# Check if the oh-my-zsh directory exists
-if [ -d "$HOME/.oh-my-zsh" ]; then
-    printf "${NOTE} Oh My Zsh found. Creating a backup before uninstalling...${RESET}\n"
-    # Perform backup using cp -r and create a backup directory with -backup suffix
-    cp -r "$HOME/.oh-my-zsh" "$HOME/.oh-my-zsh-backup" || true
-    mv "$HOME/.zshrc" "$HOME/.zshrc-backup" || true
-
-    printf "${NOTE} Backup created....${RESET}\n"
-fi
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_zsh.log"
 
+## Optional Pokemon color scripts
+while true; do
+    read -p "${CAT} OPTIONAL - Do you want to add Pokemon color scripts? (y/n): " choice
+    case "$choice" in
+        [Yy]*)
+            zsh+=('pokemon-colorscripts-git')
+            sed -i '/#pokemon-colorscripts --no-title -s -r/s/^#//' assets/.zshrc
+            break
+            ;;
+        [Nn]*)
+            echo "${NOTE}Skipping Pokemon color scripts installation.${RESET}" 2>&1 | tee -a "$LOG"
+            break
+            ;;
+        *)
+            echo "${WARN}Please enter 'y' for yes or 'n' for no.${RESET}"
+            ;;
+    esac
+done
 
 # Installing zsh packages
 printf "${NOTE} Installing core zsh packages...${RESET}\n"
-for ZSH in zsh zsh-completions pokemon-colorscripts-git; do
+for ZSH in "${zsh[@]}"; do
   install_package "$ZSH" 2>&1 | tee -a "$LOG"
   if [ $? -ne 0 ]; then
      echo -e "\e[1A\e[K${ERROR} - $ZSH install had failed, please check the install.log"
@@ -79,34 +56,42 @@ if command -v zsh >/dev/null; then
 	if [ ! -d "$HOME/.oh-my-zsh" ]; then
   		sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended || true
 	else
-		echo "Directory .oh-my-zsh already exists. Skipping re-installation."
+		echo "Directory .oh-my-zsh already exists. Skipping re-installation." 2>&1 | tee -a "$LOG"
 	fi
 	# Check if the directories exist before cloning the repositories
-	if [ ! -d "$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions" ]; then
+	if [ ! -d "$HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions" ]; then
     	git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions || true
 	else
-    	echo "Directory zsh-autosuggestions already exists. Skipping cloning."
+    	echo "Directory zsh-autosuggestions already exists. Skipping cloning." 2>&1 | tee -a "$LOG"
 	fi
 
-	if [ ! -d "$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting" ]; then
+	if [ ! -d "$HOME/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" ]; then
     	git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting || true
 	else
-    	echo "Directory zsh-syntax-highlighting already exists. Skipping cloning."
+    	echo "Directory zsh-syntax-highlighting already exists. Skipping cloning." 2>&1 | tee -a "$LOG"
+	fi
+	
+	# Check if ~/.zshrc and .zprofile exists, create a backup, and copy the new configuration
+	if [ -f "$HOME/.zshrc" ]; then
+    	cp -b "$HOME/.zshrc" "$HOME/.zshrc-backup" || true
 	fi
 
+	if [ -f "$HOME/.zprofile" ]; then
+    	cp -b "$HOME/.zprofile" "$HOME/.zprofile-backup" || true
+	fi
+	
+	# Copying the preconfigured zsh themes and profile
     cp -r 'assets/.zshrc' ~/
     cp -r 'assets/.zprofile' ~/
 
     printf "${NOTE} Changing default shell to zsh...\n"
 
 	while ! chsh -s $(which zsh); do
-    	echo "${ERROR} Authentication failed. Please enter the correct password."
+    	echo "${ERROR} Authentication failed. Please enter the correct password." 2>&1 | tee -a "$LOG"
     	sleep 1
 	done
 	printf "${NOTE} Shell changed successfully to zsh.\n" 2>&1 | tee -a "$LOG"
 
 fi
-  printf "\n\n\n\n"
-  
 
-clear
+clear