Merge pull request #2 from Marin-Kitagawa/main

Enhanced the installation script

install.sh

@@ -1,29 +1,91 @@
 #!/bin/bash
 
-# Update system and install Git
-sudo pacman -Syu git --noconfirm
+if [[ "$(id -u)" -eq 0 ]]; then
+  echo "This script must not be run as root"
+  exit 1
+fi
+
+is_installed() {
+  pacman -Qi "$1" &>/dev/null
+  return $?
+}
+
+# Update system 
+sudo pacman -Syu
+
+if ! is_installed git; then
+  sudo pacman -S git --noconfirm
+else
+  echo "git v$(git -v | cut -d' ' -f3) is already installed in your system"
+fi
 
 # Clone and install Paru
-git clone https://aur.archlinux.org/paru-bin.git && cd paru-bin && makepkg -si --noconfirm && cd ..
+if command -v paru &>/dev/null; then
+  echo "paru $(paru -V | cut -d' ' -f2) is already installed in your system"
+else
+  if command -v yay &>/dev/null; then
+    "yay $(yay -V | cut -d' ' -f2) is installed in your system"
+  else
+    echo "Both yay and paru are not present in your system."
+    echo "Installing paru..."
+    git clone https://aur.archlinux.org/paru-bin.git && cd paru-bin && makepkg -si --noconfirm && cd ..
+  fi
+fi 
 
-# Install necessary packages using Paru
-paru -Syu base-devel qtile python-psutil pywal-git picom-jonaburg-fix dunst zsh starship mpd ncmpcpp playerctl brightnessctl alacritty pfetch htop flameshot thunar roficlip rofi ranger cava pulseaudio pavucontrol neovim vim git sddm --noconfirm 
+# Update and install dependencies
+if command -v paru &>/dev/null
+then
+  paru -Syu base-devel qtile python-psutil pywal-git picom-jonaburg-fix dunst zsh starship mpd ncmpcpp playerctl brightnessctl alacritty pfetch htop flameshot thunar roficlip rofi ranger cava pulseaudio pavucontrol neovim vim git --noconfirm  --needed
+  if ! is_installed lightdm && ! is_installed sddm
+    paru -S sddm
+  fi
+else
+  if command -v yay &>/dev/null
+  then
+    yay -Syu base-devel qtile python-psutil pywal-git picom-jonaburg-fix dunst zsh starship mpd ncmpcpp playerctl brightnessctl alacritty pfetch htop flameshot thunar roficlip rofi ranger cava pulseaudio pavucontrol neovim vim git sddm --noconfirm  --needed
+  if ! is_installed lightdm && ! is_installed sddm
+    yay -S sddm
+  fi
+fi
 
-# Set Zsh as the default shell
-chsh -s $(which zsh)
+# Check and set Zsh as the default shell
+[[ "$(awk -F: -v user="$USER" '$1 == user {print $NF}' /etc/passwd) " =~ "zsh " ]] || chsh -s $(which zsh)
 
 # Install Oh My Zsh
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended 
+if [ ! -d ~/.oh-my-zsh/ ]; then
+  sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended 
+else
+  omz update
+fi
 
 # Install Zsh plugins
-git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
-git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+[[ "${plugins[*]} " =~ "zsh-autosuggestions " ]] || git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+[[ "${plugins[*]} " =~ "zsh-syntax-highlighting " ]] || git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+
+# Make Backup
+echo "Backing up the current configs. All the backeup files will be available at ~/.cozy.bak"
+mkdir ~/.cozy.bak
+for folder in .config/*; do
+  rel=$(echo $folder | rev | cut -d/ -f1 | rev)
+  if [ -d ~/.config/$rel ]; then
+    echo "Backing up ~/.config/$rel"
+    cp -r ~/.config/$rel ~/.cozy.bak
+    echo "Backed up ~/.config/$rel" successfully.
+    echo "Removing old config for $rel"
+    rm -rf ~/.config/$rel
+    echo "Copying new config for $rel"
+    cp -r .config/$rel ~/.config
+  else
+    echo "Folder ~/.config/$rel doesn't exist"
+    echo "Copying new config for $rel"
+    cp -r .config/$rel ~/.config
+  fi
+done
 
-# Clone and install Cozytile
-p -R ./. ~/ 
 
 cp -R ~/Fonts/Jetbrains/ttf/. ~/.local/share/fonts/
 
 # Enable and start SDDM
-sudo systemctl enable sddm && sudo systemctl start sddm
-
+if is_installed sddm
+  sudo systemctl enable sddm && sudo systemctl start sddm
+fi