small refactor (#563)

* small refactor * Fix formatting --------- Co-authored-by: nnyyxxxx <[email protected]>
ChrisTitusTech · Sep 20, 2024 · 2662aa0 · 2662aa0
1 parent 7946000
commit 2662aa0
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 12 deletions.
diff --git a/core/tabs/applications-setup/alacritty-setup.sh b/core/tabs/applications-setup/alacritty-setup.sh
@@ -3,8 +3,8 @@
 . ../common-script.sh
 
 installAlacritty() {
-    printf "%b\n" "${YELLOW}Installing Alacritty...${RC}"
     if ! command_exists alacritty; then
+    printf "%b\n" "${YELLOW}Installing Alacritty...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm alacritty
@@ -19,7 +19,7 @@ installAlacritty() {
 }
 
 setupAlacrittyConfig() {
-    printf "%b\n" "${YELLOW}Copy alacritty config files${RC}"
+    printf "%b\n" "${YELLOW}Copying alacritty config files...${RC}"
     if [ -d "${HOME}/.config/alacritty" ] && [ ! -d "${HOME}/.config/alacritty-bak" ]; then
         cp -r "${HOME}/.config/alacritty" "${HOME}/.config/alacritty-bak"
     fi

diff --git a/core/tabs/applications-setup/bottles-setup.sh b/core/tabs/applications-setup/bottles-setup.sh
@@ -2,13 +2,20 @@
 
 . ../common-script.sh
 
-install_bottles() {
+installBottles() {
+    if ! command_exists flatpak; then
     printf "%b\n" "${YELLOW}Installing Bottles...${RC}"
-    . ./setup-flatpak.sh
-    flatpak install -y flathub com.usebottles.bottles
-    printf "%b\n" "${GREEN}Bottles installed successfully. Restart the system to apply changes...${RC}"
+        case "$PACKAGER" in
+            *)
+                . ./setup-flatpak.sh
+                flatpak install -y flathub com.usebottles.bottles
+                ;;
+        esac
+    else
+        printf "%b\n" "${GREEN}Bottles is already installed.${RC}"
+    fi
 }
 
 checkEnv
 checkEscalationTool
-install_bottles
+installBottles
diff --git a/core/tabs/applications-setup/fastfetch-setup.sh b/core/tabs/applications-setup/fastfetch-setup.sh
@@ -3,8 +3,8 @@
 . ../common-script.sh
 
 installFastfetch() {
-    printf "%b\n" "${YELLOW}Installing Fastfetch...${RC}"
     if ! command_exists fastfetch; then
+        printf "%b\n" "${YELLOW}Installing Fastfetch...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm fastfetch

diff --git a/core/tabs/applications-setup/kitty-setup.sh b/core/tabs/applications-setup/kitty-setup.sh
@@ -3,8 +3,8 @@
 . ../common-script.sh
 
 installKitty() {
-    printf "%b\n" "${YELLOW}Install Kitty if not already installed...${RC}"
     if ! command_exists kitty; then
+        printf "%b\n" "${YELLOW}Installing Kitty...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm kitty

diff --git a/core/tabs/applications-setup/mybash-setup.sh b/core/tabs/applications-setup/mybash-setup.sh
@@ -5,6 +5,7 @@
 gitpath="$HOME/.local/share/mybash"
 
 installDepend() {
+    if ! command_exists bash bash-completion tar bat tree unzip fontconfig git; then
     printf "%b\n" "${YELLOW}Installing Bash...${RC}"
     case "$PACKAGER" in
         pacman)
@@ -24,6 +25,7 @@ installDepend() {
             exit 1
             ;;
     esac
+    fi
 }
 
 cloneMyBash() {

diff --git a/core/tabs/applications-setup/neovim-setup.sh b/core/tabs/applications-setup/neovim-setup.sh
@@ -14,6 +14,7 @@ cloneNeovim() {
 }
 
 installNeovim() {
+    if ! command_exists neovim ripgrep git fzf; then
     printf "%b\n" "${YELLOW}Installing Neovim...${RC}"
     case "$PACKAGER" in
         pacman)
@@ -33,6 +34,7 @@ installNeovim() {
             exit 1
             ;;
     esac
+    fi
 }
 
 backupNeovimConfig() {

diff --git a/core/tabs/applications-setup/rofi-setup.sh b/core/tabs/applications-setup/rofi-setup.sh
@@ -3,8 +3,8 @@
 . ../common-script.sh
 
 installRofi() {
-    printf "%b\n" "${YELLOW}Installing Rofi...${RC}"
     if ! command_exists rofi; then
+    printf "%b\n" "${YELLOW}Installing Rofi...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm rofi

diff --git a/core/tabs/applications-setup/zsh-setup.sh b/core/tabs/applications-setup/zsh-setup.sh
@@ -4,8 +4,8 @@
 
 # Function to install zsh
 installZsh() {
-  printf "%b\n" "${YELLOW}Installing Zsh...${RC}"
   if ! command_exists zsh; then
+    printf "%b\n" "${YELLOW}Installing Zsh...${RC}"
       case "$PACKAGER" in
           pacman)
               "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm zsh

diff --git a/core/tabs/security/firewall-baselines.sh b/core/tabs/security/firewall-baselines.sh
@@ -3,8 +3,8 @@
 . ../common-script.sh
 
 installPkg() {
-    printf "%b\n" "${YELLOW}Installing UFW...${RC}"
     if ! command_exists ufw; then
+     printf "%b\n" "${YELLOW}Installing UFW...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm ufw