X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/xdg-ninja.git/blobdiff_plain/2c4c10ff39288bb476d00211302c5787fc8343f1..4e9316b332eaa0ed5832a1246878dd6b015cb038:/xdg-ninja.sh

diff --git a/xdg-ninja.sh b/xdg-ninja.sh
index 602f262..94a8969 100755
--- a/xdg-ninja.sh
+++ b/xdg-ninja.sh
@@ -87,18 +87,23 @@ 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" "$1" | sed -e 's/\\n/\
+/g' -e 's/\\\"/\"/g' -e '$ s/\n*$/\
+\
+/' # Replace \n with literal newline and \" with ", normalize number of trailing newlines to 2
+}
+
 # Function to handle the formatting of output
 log() {
     MODE="$1"
@@ -126,12 +131,12 @@ log() {
         ;;
 
     HELP)
-        if $USE_GLOW; then
-            printf "%s\n" "$HELP" | glow -
-        elif $USE_BAT; then
-            printf "%s\n" "$HELP" | bat -pp --decorations=always --color=always --language markdown
+        if [ "$USE_GLOW" = true ]; then
+            decode_string "$HELP" | glow -
+        elif [ "$USE_BAT" = true ]; then
+            decode_string "$HELP" | bat -pp --decorations=always --color=always --language markdown
         else
-            printf "%s\n" "$HELP"
+            decode_string "$HELP"
         fi
         ;;
 
@@ -140,14 +145,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
 
@@ -155,8 +158,8 @@ check_file() {
         log SUCS "$NAME" "$FILENAME" "$HELP"
         ;;
 
-    1 | 2)
-        if "$MOVABLE"; then
+    1)
+        if [ "$MOVABLE" = true ]; then
             log ERR "$NAME" "$FILENAME" "$HELP"
         else
             log WARN "$NAME" "$FILENAME" "$HELP"
@@ -171,30 +174,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 "$(dirname "$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