X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/xdg-ninja.git/blobdiff_plain/4228476fa8dcd6c2747e3d71fd435b8ed4f58e6b..f0e4b7f74bd2069ed8739319b588fbd6dfa91cbb:/xdg-ninja.sh

diff --git a/xdg-ninja.sh b/xdg-ninja.sh
index 7b68acf..6c8a2f2 100755
--- a/xdg-ninja.sh
+++ b/xdg-ninja.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2016
 
 USE_GLOW=false
 USE_BAT=false
@@ -52,27 +51,27 @@ done
 
 if [ -z "${XDG_DATA_HOME}" ]; then
     printf '\033[1;36m%s\033[1;0m\n' "The \$XDG_DATA_HOME environment variable is not set, make sure to add it to your shell's configuration before setting any of the other environment variables!"
-    printf '\033[1;36m    ⤷ \033[1mThe recommended value is: \033[1;3m$HOME/.local/share\033[1;0m\n'
+    printf "\033[1;36m    ⤷ \033[1mThe recommended value is: \033[1;3m\$HOME/.local/share\033[1;0m\n"
 fi
 if [ -z "${XDG_CONFIG_HOME}" ]; then
     printf '\033[1;36m%s\033[1;0m\n' "The \$XDG_CONFIG_HOME environment variable is not set, make sure to add it to your shell's configuration before setting any of the other environment variables!"
-    printf '\033[1;36m    ⤷ \033[1mThe recommended value is: \033[1;3m$HOME/.config\033[1;0m\n'
+    printf "\033[1;36m    ⤷ \033[1mThe recommended value is: \033[1;3m\$HOME/.config\033[1;0m\n"
 fi
 if [ -z "${XDG_STATE_HOME}" ]; then
     printf '\033[1;36m%s\033[1;0m\n' "The \$XDG_STATE_HOME environment variable is not set, make sure to add it to your shell's configuration before setting any of the other environment variables!"
-    printf '\033[1;36m    ⤷ \033[1mThe recommended value is: \033[1;3m$HOME/.local/state\033[1;0m\n'
+    printf "\033[1;36m    ⤷ \033[1mThe recommended value is: \033[1;3m\$HOME/.local/state\033[1;0m\n"
 fi
 if [ -z "${XDG_CACHE_HOME}" ]; then
     printf '\033[1;36m%s\033[1;0m\n' "The \$XDG_CACHE_HOME environment variable is not set, make sure to add it to your shell's configuration before setting any of the other environment variables!"
-    printf '\033[1;36m    ⤷ \033[1mThe recommended value is: \033[1;3m$HOME/.cache\033[1;0m\n'
+    printf "\033[1;36m    ⤷ \033[1mThe recommended value is: \033[1;3m\$HOME/.cache\033[1;0m\n"
 fi
 if [ -z "${XDG_RUNTIME_DIR}" ]; then
     printf '\033[1;36m%s\033[1;0m\n' "The \$XDG_RUNTIME_DIR environment variable is not set, make sure to add it to your shell's configuration before setting any of the other environment variables!"
-    printf '\033[1;36m    ⤷ \033[1mThe recommended value is: \033[1;3m/run/user/$UID\033[1;0m\n'
+    printf "\033[1;36m    ⤷ \033[1mThe recommended value is: \033[1;3m/run/user/\$UID\033[1;0m\n"
 fi
 
 if ! command -v jq >/dev/null 2>/dev/null; then
-    printf "jq is needed to run this script, but it wasn't found. Please install it to be able to use this script."
+    printf "jq is needed to run this script, but it wasn't found. Please install it to be able to use this script.\n"
     exit
 fi
 
@@ -88,18 +87,21 @@ apply_shell_expansion() {
 }
 
 # Returns 0 if the path doesn't lead anywhere
-# Return 1 if the path points to a file, 2 if it points to a directory
-check_not_exists_file() {
+# Returns 1 if the path leads to something
+check_if_file_exists() {
     FILE_PATH=$(apply_shell_expansion "$1")
-    if [ -f "$FILE_PATH" ]; then
+    if [ -e "$FILE_PATH" ]; then
         return 1
-    elif [ -d "$FILE_PATH" ]; then
-        return 2
     else
         return 0
     fi
 }
 
+decode_string() {
+    printf "%s\n" "$1" | sed -e 's/\\n/\
+/g' -e 's/\\\"/\"/g' # Replace \n with literal newline and \" with "
+}
+
 # Function to handle the formatting of output
 log() {
     MODE="$1"
@@ -128,11 +130,11 @@ log() {
 
     HELP)
         if $USE_GLOW; then
-            printf "%s\n" "$HELP" | glow -
+            decode_string "$HELP" | glow -
         elif $USE_BAT; then
-            printf "%s\n" "$HELP" | bat -pp -f --language markdown
+            decode_string "$HELP" | bat -pp --decorations=always --color=always --language markdown
         else
-            printf "%s\n" "$HELP"
+            decode_string "$HELP"
         fi
         ;;
 
@@ -141,14 +143,12 @@ log() {
 
 # Checks that the given file does not exist, otherwise outputs help
 check_file() {
-    INPUT="$1"
-    NAME="$2"
-
-    FILENAME=$(printf "%s" "$INPUT" | jq -r .path)
-    MOVABLE=$(printf "%s" "$INPUT" | jq -r .movable)
-    HELP=$(printf "%s" "$INPUT" | jq -r .help)
+    NAME="$1"
+    FILENAME="$2"
+    MOVABLE="$3"
+    HELP="$4"
 
-    check_not_exists_file "$FILENAME"
+    check_if_file_exists "$FILENAME"
 
     case $? in
 
@@ -156,7 +156,7 @@ check_file() {
         log SUCS "$NAME" "$FILENAME" "$HELP"
         ;;
 
-    1 | 2)
+    1)
         if "$MOVABLE"; then
             log ERR "$NAME" "$FILENAME" "$HELP"
         else
@@ -172,30 +172,25 @@ check_file() {
     esac
 }
 
-# Reads a file from programs/, calls check_file on each file specified for the program
-check_program() {
-    PROGRAM=$1
-
-    NAME=$(jq -r .name "$PROGRAM")
-
-    while IFS= read -r file; do
-        check_file "$file" "$NAME"
+# Reads files from programs/, calls check_file on each file specified for each program
+do_check_programs() {
+    while IFS="
+" read -r name; read -r filename; read -r movable; read -r help; do
+        check_file "$name" "$filename" "$movable" "$help"
     done <<EOF
-$(jq -rc '.files[]' "$PROGRAM")
+$(jq 'inputs as $input | $input.files[] as $file | $input.name, $file.path, $file.movable, $file.help' "$(dirname "$0")"/programs/* | sed -e 's/^"//' -e 's/"$//')
 EOF
+# sed is to trim quotes
 }
 
-# Loops over all files in the programs/ directory and calls check_program
-enumerate_programs() {
+check_programs() {
     printf "\033[1;3mStarting to check your \033[1;36m\$HOME.\033[1;0m\n"
     printf "\n"
-    for prog_filename in "${0%/*}"/programs/*; do
-        check_program "$prog_filename"
-    done
+    do_check_programs
     printf "\033[1;3mDone checking your \033[1;36m\$HOME.\033[1;0m\n"
     printf "\n"
     printf "\033[3mIf you have files in your \033[1;36m\$HOME\033[1;0m that shouldn't be there, but weren't recognised by xdg-ninja, please consider creating a configuration file for it and opening a pull request on github.\033[1;0m\n"
     printf "\n"
 }
 
-enumerate_programs
+check_programs