From f4fcd6deed8888ac51a4c6af0564a5f50b8224b3 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 22 Feb 2025 10:34:15 +0900 Subject: [PATCH 1/3] minor update --- install-scripts/zsh.sh | 1 + install-scripts/zsh_pokemon.sh | 21 ++++----------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index 7c931a8..d5661f2 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -4,6 +4,7 @@ zsh_pkg=( eza + mercurial zsh zsh-completions fzf diff --git a/install-scripts/zsh_pokemon.sh b/install-scripts/zsh_pokemon.sh index 1fc925f..c9b5772 100755 --- a/install-scripts/zsh_pokemon.sh +++ b/install-scripts/zsh_pokemon.sh @@ -2,10 +2,6 @@ # 💫 https://github.com/JaKooLit 💫 # # pokemon-color-scripts# -poke=( - mercurial -) - ## 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 )" @@ -19,22 +15,13 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh" # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_zsh_pokemon.log" -# for the new oh my zsh theme -printf "${NOTE} Installing ${SKY_BLUE}additional dependencies for oh my zsh theme${RESET}\n" -for pok in "${poke[@]}"; do +# Install Pokemon Color Scripts +printf "${NOTE} Installing ${SKY_BLUE}Pokemon Color Scripts${RESET}\n" +for pok in "pokemon-colorscripts-git"; do install_package "$pok" "$LOG" done + printf "\n%.0s" {1..1} - -printf "${INFO} Installing ${SKY_BLUE}Pokemon color scripts${RESET} ..." - -if [ -d "pokemon-colorscripts" ]; then - cd pokemon-colorscripts && git pull && sudo ./install.sh && cd .. - else - git clone --depth 1 https://gitlab.com/phoneybadger/pokemon-colorscripts.git && - cd pokemon-colorscripts && sudo ./install.sh && cd .. -fi - # Check if ~/.zshrc exists if [ -f "$HOME/.zshrc" ]; then sed -i '/#pokemon-colorscripts --no-title -s -r | fastfetch -c $HOME\/.config\/fastfetch\/config-pokemon.jsonc --logo-type file-raw --logo-height 10 --logo-width 5 --logo -/s/^#//' "$HOME/.zshrc" >> "$LOG" 2>&1 From 653ca995ae96f416cc75cdcb1cebb5aa86f6088e Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 22 Feb 2025 11:07:18 +0900 Subject: [PATCH 2/3] updated zsh_pokemon.sh --- install-scripts/zsh_pokemon.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/install-scripts/zsh_pokemon.sh b/install-scripts/zsh_pokemon.sh index c9b5772..d8c22cd 100755 --- a/install-scripts/zsh_pokemon.sh +++ b/install-scripts/zsh_pokemon.sh @@ -15,6 +15,18 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh" # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_zsh_pokemon.log" +printf "${NOTE} Removing any traces of ${SKY_BLUE}Pokemon Color Scripts${RESET}\n" + +# Check if the pokemon directory exists +if [ -d "/usr/local/opt/pokemon-colorscripts" ]; then + sudo rm -rf /usr/local/opt/pokemon-colorscripts +fi + +# Check if the pokemon file exists +if [ -f "/usr/local/bin/pokemon-colorscripts" ]; then + sudo rm -f /usr/local/bin/pokemon-colorscripts +fi + # Install Pokemon Color Scripts printf "${NOTE} Installing ${SKY_BLUE}Pokemon Color Scripts${RESET}\n" for pok in "pokemon-colorscripts-git"; do From 2828811ad8afabb82cad7075f07260f8e1c17bf1 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 22 Feb 2025 11:58:03 +0900 Subject: [PATCH 3/3] updated zsh.rc --- install-scripts/zsh.sh | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index d5661f2..89095cd 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -7,6 +7,9 @@ zsh_pkg=( mercurial zsh zsh-completions +) + +zsh_pkg2=( fzf ) @@ -29,23 +32,30 @@ for ZSH in "${zsh_pkg[@]}"; do install_package "$ZSH" "$LOG" done + +# Check if the pokemon directory exists +if [ -d "zsh-completions" ]; then + rm -rf zsh-completions +fi + # Install Oh My Zsh, plugins, and set zsh as default shell if command -v zsh >/dev/null; then printf "${NOTE} Installing ${SKY_BLUE}Oh My Zsh and plugins${RESET} ...\n" - if [ ! -d "$HOME/.oh-my-zsh" ]; then - sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended || true + if [ ! -d "$HOME/.oh-my-zsh" ]; then + sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended else - echo "${INFO} Directory .oh-my-zsh already exists. Skipping re-installation." 2>&1 | tee -a "$LOG" + echo "${INFO} 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 - git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions || true + git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions else echo "${INFO} Directory zsh-autosuggestions already exists. Cloning Skipped." 2>&1 | tee -a "$LOG" fi 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 + git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting else echo "${INFO} Directory zsh-syntax-highlighting already exists. Cloning Skipped." 2>&1 | tee -a "$LOG" fi @@ -79,6 +89,12 @@ if command -v zsh >/dev/null; then fi fi +# Installing core zsh packages +printf "\n%s - Installing ${SKY_BLUE}fzf${RESET} .... \n" "${NOTE}" +for ZSH2 in "${zsh_pkg2[@]}"; do + install_package "$ZSH2" "$LOG" +done + # copy additional oh-my-zsh themes from assets if [ -d "$HOME/.oh-my-zsh/themes" ]; then cp -r assets/add_zsh_theme/* ~/.oh-my-zsh/themes >> "$LOG" 2>&1