Merge branch 'main' into testing-7

Author: ChrisTitusTech

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,3 @@
-# Pull Request
-
-## Title
-<!--[Provide a succinct and descriptive title for the pull request.]-->
-
 ## Type of Change
 - [ ] New feature
 - [ ] Bug fix

.github/workflows/pr-labels.yaml

@@ -1,16 +1,17 @@
 name: Manage labels based on PR body
 
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, edited, reopened, synchronize]
 
 jobs:
   manage-labels:
     runs-on: ubuntu-latest
     steps:
       - name: Analyze PR Body and manage labels
+        shell: bash
         run: |
-          body="${{ github.event.pull_request.body }}"
+          body=$(jq -r '.pull_request.body' "$GITHUB_EVENT_PATH")
           labels_to_add=()
           labels_to_remove=()
           declare -A label_checks=(
@@ -20,19 +21,23 @@ jobs:
             ["Refactoring"]="refactor"
             ["UI/UX improvement"]="UI/UX"
           )
-          for key in "${!label_checks[@]}"; do
-            if echo "$body" | grep -q "\- \[x\] $key"; then
-              labels_to_add+=("${label_checks[$key]}")
+          for pattern in "${!label_checks[@]}"; do
+            label="${label_checks[$pattern]}"
+            if echo "$body" | grep -Eq "\- \[x\] ($pattern)"; then
+              labels_to_add+=("$label")
             else
-              labels_to_remove+=("${label_checks[$key]}")
+              labels_to_remove+=("$label")
             fi
           done
-          echo "LABELS_TO_ADD=${labels_to_add[*]}" >> $GITHUB_ENV
-          echo "LABELS_TO_REMOVE=${labels_to_remove[*]}" >> $GITHUB_ENV
+
+          echo "LABELS_TO_ADD=$(IFS=,; echo "${labels_to_add[*]}")" >> $GITHUB_ENV
+          echo "LABELS_TO_REMOVE=$(IFS=,; echo "${labels_to_remove[*]}")" >> $GITHUB_ENV
+
       - name: Add labels if necessary
         if: env.LABELS_TO_ADD != ''
         run: |
-          for label in ${{ env.LABELS_TO_ADD }}; do
+          IFS=',' read -ra labels <<< "${LABELS_TO_ADD}"
+          for label in "${labels[@]}"; do
             curl -s -X POST \
               -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
               -H "Accept: application/vnd.github.v3+json" \
@@ -42,9 +47,10 @@ jobs:
       - name: Remove labels if necessary
         if: env.LABELS_TO_REMOVE != ''
         run: |
-          for label in ${{ env.LABELS_TO_REMOVE }}; do
+          IFS=',' read -ra labels <<< "${LABELS_TO_REMOVE}"
+          for label in "${labels[@]}"; do
             curl -s -X DELETE \
               -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
               -H "Accept: application/vnd.github.v3+json" \
               https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels/$label
-          done
+          done

start.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 rc='\033[0m'
 red='\033[0;31m'

startdev.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 RC='\033[0m'
 RED='\033[0;31m'
@@ -35,7 +35,7 @@ check() {
     local message=$2
 
     if [ $exit_code -ne 0 ]; then
-        echo -e "${RED}ERROR: $message${RC}"
+        printf "%b\n" "${RED}ERROR: $message${RC}"
         exit 1
     fi
 }

tabs/applications-setup/alacritty-setup.sh

@@ -2,8 +2,8 @@
 
 . ../common-script.sh
 
-setupAlacritty() {
-    printf "%b\n" "${YELLOW}Install Alacritty if not already installed...${RC}"
+installAlacritty() {
+    echo "Installing Alacritty..."
     if ! command_exists alacritty; then
         case ${PACKAGER} in
             pacman)
@@ -31,5 +31,5 @@ setupAlacrittyConfig() {
 
 checkEnv
 checkEscalationTool
-setupAlacritty
+installAlacritty
 setupAlacrittyConfig

tabs/applications-setup/dwmtitus-setup.sh

@@ -143,27 +143,30 @@ clone_config_folders() {
 }
 
 configure_backgrounds() {
+    # Set the variable PIC_DIR which stores the path for images
+    PIC_DIR="$HOME/Pictures"
+
     # Set the variable BG_DIR to the path where backgrounds will be stored
-    BG_DIR="$HOME/Pictures/backgrounds"
+    BG_DIR="$PIC_DIR/backgrounds"
 
     # Check if the ~/Pictures directory exists
-    if [ ! -d "~/Pictures" ]; then
+    if [ ! -d "$PIC_DIR" ]; then
         # If it doesn't exist, print an error message and return with a status of 1 (indicating failure)
         printf "%b\n" "${RED}Pictures directory does not exist${RC}"
         mkdir ~/Pictures
         printf "%b\n" "${GREEN}Directory was created in Home folder${RC}"
     fi
-    
+
     # Check if the backgrounds directory (BG_DIR) exists
     if [ ! -d "$BG_DIR" ]; then
         # If the backgrounds directory doesn't exist, attempt to clone a repository containing backgrounds
-        if ! git clone https://github.com/ChrisTitusTech/nord-background.git ~/Pictures; then
+        if ! git clone https://github.com/ChrisTitusTech/nord-background.git "$PIC_DIR/nord-background"; then
             # If the git clone command fails, print an error message and return with a status of 1
             printf "%b\n" "${RED}Failed to clone the repository${RC}"
             return 1
         fi
         # Rename the cloned directory to 'backgrounds'
-        mv ~/Pictures/nord-background ~/Pictures/backgrounds
+        mv "$PIC_DIR/nord-background" "$PIC_DIR/backgrounds"
         # Print a success message indicating that the backgrounds have been downloaded
         printf "%b\n" "${GREEN}Downloaded desktop backgrounds to $BG_DIR${RC}"    
     else
@@ -261,9 +264,6 @@ setupDisplayManager() {
                 ;;
         esac
     fi
-    
-
-    
 }
 
 install_slstatus() {

tabs/applications-setup/fastfetch-setup.sh

@@ -2,8 +2,9 @@
 
 . ../common-script.sh
 
-setupFastfetch() {
+installFastfetch() {
     printf "%b\n" "${YELLOW}Installing Fastfetch if not already installed...${RC}"
+
     if ! command_exists fastfetch; then
         case ${PACKAGER} in
             pacman)
@@ -29,5 +30,5 @@ setupFastfetchConfig() {
 
 checkEnv
 checkEscalationTool
-setupFastfetch
+installFastfetch
 setupFastfetchConfig

tabs/applications-setup/kitty-setup.sh

@@ -2,7 +2,7 @@
 
 . ../common-script.sh
 
-setupKitty() {
+installKitty() {
     printf "%b\n" "${YELLOW}Install Kitty if not already installed...${RC}"
     if ! command_exists kitty; then
         case ${PACKAGER} in
@@ -19,7 +19,7 @@ setupKitty() {
 }
 
 setupKittyConfig() {
-    printf "%b\n" "${YELLOW}Copy Kitty config files${RC}"
+    printf "%b\n" "${YELLOW}Copying Kitty configuration files...${RC}"
     if [ -d "${HOME}/.config/kitty" ] && [ ! -d "${HOME}/.config/kitty-bak" ]; then
         cp -r "${HOME}/.config/kitty" "${HOME}/.config/kitty-bak"
     fi
@@ -30,5 +30,5 @@ setupKittyConfig() {
 
 checkEnv
 checkEscalationTool
-setupKitty
+installKitty
 setupKittyConfig

tabs/applications-setup/mybash-setup.sh

@@ -14,7 +14,7 @@ cloneMyBash() {
 }
 
 installDepend() {
-    printf "%b\n" "${YELLOW}Install mybash if not already installed${RC}"
+    printf "%b\n" "${YELLOW}Installing Bash...${RC}"
     case "$PACKAGER" in
         pacman)
             $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm bash bash-completion tar bat tree unzip fontconfig

tabs/applications-setup/neovim-setup.sh

@@ -13,8 +13,8 @@ cloneNeovim() {
     cd "$HOME" && git clone https://github.com/ChrisTitusTech/neovim.git "$HOME/.local/share/neovim"
 }
 
-setupNeovim() {
-    printf "%b\n" "${YELLOW}Install Neovim if not already installed${RC}"
+installNeovim() {
+    printf "%b\n" "${YELLOW}Installing Neovim...${RC}"
     case "$PACKAGER" in
         pacman)
             $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm neovim ripgrep fzf python-virtualenv luarocks go shellcheck
@@ -36,20 +36,22 @@ setupNeovim() {
 }
 
 backupNeovimConfig() {
+    printf "%b\n" "${YELLOW}Backing up existing configuration files...${RC}"
     if [ -d "$HOME/.config/nvim" ] && [ ! -d "$HOME/.config/nvim-backup" ]; then
         cp -r "$HOME/.config/nvim" "$HOME/.config/nvim-backup"
     fi
     rm -rf "$HOME/.config/nvim"
 }
 
 linkNeovimConfig() {
+    printf "%b\n" "${YELLOW}Linking Neovim configuration files...${RC}"
     mkdir -p "$HOME/.config/nvim"
     ln -s "$gitpath/titus-kickstart/"* "$HOME/.config/nvim/" # Wild card is used here to link all contents of titus-kickstart.
 }
 
 checkEnv
 checkEscalationTool
 cloneNeovim
-setupNeovim
+installNeovim
 backupNeovimConfig
 linkNeovimConfig