chore: shfmt, cleanup

Author: ivuorinen

config/alias

@@ -130,6 +130,6 @@ X_ALIAS_FILES=(
 )
 for aliasFile in "${X_ALIAS_FILES[@]}"; do
   # shellcheck source=$HOME/.config/alias-secret
-  [ -f "$aliasFile" ] && source "$aliasFile" && msg "Sourced $aliasFile"
+  [ -f "$aliasFile" ] && source "$aliasFile" && msgr ok "Sourced $aliasFile"
 done
 unset X_ALIAS_FILES

config/shared.sh

@@ -42,7 +42,7 @@ if ! declare -f msg > /dev/null; then
   # $1 - message (string)
   msg()
   {
-    [ "$VERBOSE" -eq 1 ] && echo "$1"
+    [ "$VERBOSE" -eq 1 ] && msgr msg "$1"
     return 0
   }
   msg "msg was not defined, defined it now"
@@ -54,7 +54,7 @@ if ! declare -f msg_err > /dev/null; then
   # $1 - error message (string)
   msg_err()
   {
-    echo "(!) ERROR: $1" >&2
+    msgr err "$1" >&2
     exit 1
   }
 fi
@@ -65,7 +65,7 @@ if ! declare -f msg_done > /dev/null; then
   # $1 - message (string)
   msg_done()
   {
-    echo "✓ $1"
+    msgr done "$1"
     return 0
   }
 fi
@@ -76,7 +76,7 @@ if ! declare -f msg_run > /dev/null; then
   # $1 - message (string)
   msg_run()
   {
-    echo "→ $1"
+    msgr run "$1"
     return 0
   }
 fi
@@ -87,10 +87,29 @@ if ! declare -f msg_ok > /dev/null; then
   # $1 - message (string)
   msg_ok()
   {
-    echo "✓ $1"
+    msgr ok "$1"
     return 0
   }
 fi
 
+if ! declare -f array_diff > /dev/null; then
+  # Function to compare two arrays and return the difference
+  # Example: array_diff DIFFERENCE ARRAY1 ARRAY2
+  # $1 - variable to store the difference
+  # $2 - first array
+  # $3 - second array
+  # Output to $1 the difference between $2 and $3
+  # Source: https://stackoverflow.com/a/42399479/594940
+  array_diff()
+  {
+    # shellcheck disable=SC1083,SC2086
+    eval local ARR1=\(\"\${$2[@]}\"\)
+    # shellcheck disable=SC1083,SC2086
+    eval local ARR2=\(\"\${$3[@]}\"\)
+    local IFS=$'\n'
+    mapfile -t "$1" < <(comm -23 <(echo "${ARR1[*]}" | sort) <(echo "${ARR2[*]}" | sort))
+  }
+fi
+
 source "$DOTFILES/config/exports"
 source "$DOTFILES/config/alias"

install

@@ -25,9 +25,9 @@ git submodule update --init --recursive "${DOTBOT_DIR}"
 if [ "${DOTBOT_HOST}" != "" ]; then
   DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}"
   echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}"
-  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] &&
-    echo "(!) Found $DOTBOT_HOST_CONFIG" &&
-    "$DOTBOT_BIN_PATH" \
+  [ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \
+    && echo "(!) Found $DOTBOT_HOST_CONFIG" \
+    && "$DOTBOT_BIN_PATH" \
       -d "$BASEDIR" \
       --plugin-dir=tools/dotbot-asdf \
       --plugin-dir=tools/dotbot-brew \

local/bin/a

@@ -19,7 +19,8 @@ for arg in "$@"; do
 done
 
 # Ensure log directory and file exist with correct permissions
-prepare_log_file() {
+prepare_log_file()
+{
   local log_dir
   log_dir=$(dirname "$LOG_FILE")
 
@@ -40,7 +41,8 @@ prepare_log_file() {
 prepare_log_file
 
 # Logging function
-log_message() {
+log_message()
+{
   local message="$1"
   echo "$(date +'%Y-%m-%d %H:%M:%S') - $message" >> "$LOG_FILE"
 
@@ -51,8 +53,9 @@ log_message() {
 }
 
 # Function to print usage
-print_help() {
-  cat <<EOF
+print_help()
+{
+  cat << EOF
 Usage: a [command] [file_or_directory] [options]
 
 Commands:
@@ -88,13 +91,15 @@ EOF
 }
 
 # Function to print version
-print_version() {
+print_version()
+{
   echo "a version $VERSION"
   echo "Created by Ismo Vuorinen <https://github.com/ivuorinen>"
 }
 
 # Function to fetch keys if missing
-fetch_keys_if_missing() {
+fetch_keys_if_missing()
+{
   if [[ ! -f "$KEYS_FILE" ]]; then
     log_message "Keys file '$KEYS_FILE' not found. Attempting to fetch from $KEYS_SOURCE..."
     mkdir -p "$(dirname "$KEYS_FILE")"
@@ -111,7 +116,8 @@ fetch_keys_if_missing() {
 }
 
 # Function to encrypt files or directories
-encrypt_file_or_directory() {
+encrypt_file_or_directory()
+{
   local file="$1"
   if [[ -d "$file" ]]; then
     for f in "$file"/*; do
@@ -120,7 +126,7 @@ encrypt_file_or_directory() {
   elif [[ -f "$file" ]]; then
     fetch_keys_if_missing
     local output_file="${file}.age"
-    age -R "$KEYS_FILE" "$file" >"$output_file"
+    age -R "$KEYS_FILE" "$file" > "$output_file"
     if [[ $? -eq 0 ]]; then
       log_message "File encrypted successfully: $output_file"
     else
@@ -131,7 +137,8 @@ encrypt_file_or_directory() {
 }
 
 # Function to decrypt files or directories
-decrypt_file_or_directory() {
+decrypt_file_or_directory()
+{
   local file="$1"
   if [[ -d "$file" ]]; then
     for f in "$file"/*.age; do
@@ -140,7 +147,7 @@ decrypt_file_or_directory() {
   elif [[ -f "$file" ]]; then
     fetch_keys_if_missing
     local output_file="${file%.age}"
-    age -d -i "$KEYS_FILE" "$file" >"$output_file"
+    age -d -i "$KEYS_FILE" "$file" > "$output_file"
     if [[ $? -eq 0 ]]; then
       log_message "File decrypted successfully: $output_file"
     else
@@ -152,26 +159,26 @@ decrypt_file_or_directory() {
 
 # Main logic
 case "$1" in
-  e|enc|encrypt)
+  e | enc | encrypt)
     if [[ $# -lt 2 ]]; then
       log_message "Error: No file or directory specified for encryption."
       print_help
       exit 1
     fi
     encrypt_file_or_directory "$2"
     ;;
-  d|dec|decrypt)
+  d | dec | decrypt)
     if [[ $# -lt 2 ]]; then
       log_message "Error: No file or directory specified for decryption."
       print_help
       exit 1
     fi
     decrypt_file_or_directory "$2"
     ;;
-  help|--help)
+  help | --help)
     print_help
     ;;
-  version|--version)
+  version | --version)
     print_version
     ;;
   *)

local/bin/ad

@@ -6,12 +6,12 @@ KEYS_FILE="${AGE_KEYSFILE:-$HOME/.ssh/keys.txt}"
 KEYS_SOURCE="${AGE_KEYSSOURCE:-https://github.com/ivuorinen.keys}"
 
 # Check for required commands
-if ! command -v age &>/dev/null; then
+if ! command -v age &> /dev/null; then
   echo "Error: age is not installed. Please install it to continue."
   exit 1
 fi
 
-if ! command -v curl &>/dev/null; then
+if ! command -v curl &> /dev/null; then
   echo "Error: curl is not installed. Please install it to continue."
   exit 1
 fi
@@ -28,7 +28,6 @@ if [[ ! -f "$FILE" ]]; then
   exit 1
 fi
 
-
 # Check if keys file exists, otherwise fetch it
 if [[ ! -f "$KEYS_FILE" ]]; then
   echo "Keys file '$KEYS_FILE' not found. Attempting to fetch from $KEYS_SOURCE..."
@@ -51,12 +50,11 @@ fi
 
 # Decrypt the file
 OUTPUT_FILE="${FILE%.age}"
-age -d -i "$KEYS_FILE" "$FILE" >"$OUTPUT_FILE"
+age -d -i "$KEYS_FILE" "$FILE" > "$OUTPUT_FILE"
 
 if [[ $? -eq 0 ]]; then
   echo "File decrypted successfully: $OUTPUT_FILE"
 else
   echo "Error: Failed to decrypt file."
   exit 1
 fi
-

local/bin/ae

@@ -6,17 +6,18 @@ KEYS_FILE="${AGE_KEYSFILE:-$HOME/.ssh/keys.txt}"
 KEYS_SOURCE="${AGE_KEYSSOURCE:-https://github.com/ivuorinen.keys}"
 
 # Check for required commands
-if ! command -v age &>/dev/null; then
+if ! command -v age &> /dev/null; then
   echo "Error: age is not installed. Please install it to continue."
   exit 1
 fi
 
-if ! command -v curl &>/dev/null; then
+if ! command -v curl &> /dev/null; then
   echo "Error: curl is not installed. Please install it to continue."
   exit 1
 fi
 
 # Ensure a file is provided
+# shellcheck disable=SC2181
 if [[ $# -lt 1 ]]; then
   echo "Usage: $0 <file-to-encrypt>"
   exit 1
@@ -50,7 +51,7 @@ fi
 
 # Encrypt the file
 OUTPUT_FILE="${FILE}.age"
-age -R "$KEYS_FILE" "$FILE" >"$OUTPUT_FILE"
+age -R "$KEYS_FILE" "$FILE" > "$OUTPUT_FILE"
 
 if [[ $? -eq 0 ]]; then
   echo "File encrypted successfully: $OUTPUT_FILE"