X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/xdg-ninja.git/blobdiff_plain/d57efaef2f43f31e961bb3a8e45b22473a0a1b26..7fd93c796799385fb4f5f953cd2c54bfb2122f22:/xdg-ninja.sh

diff --git a/xdg-ninja.sh b/xdg-ninja.sh
index 1cf3d71..8fe952f 100755
--- a/xdg-ninja.sh
+++ b/xdg-ninja.sh
@@ -71,7 +71,7 @@ if [ -z "${XDG_RUNTIME_DIR}" ]; then
 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,12 +88,10 @@ 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() {
+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
@@ -129,7 +127,7 @@ log() {
         if $USE_GLOW; then
             printf "%s\n" "$HELP" | glow -
         elif $USE_BAT; then
-            printf "%s\n" "$HELP" | bat -pp -f --language markdown
+            printf "%s\n" "$HELP" | bat -pp --decorations=always --color=always --language markdown
         else
             printf "%s\n" "$HELP"
         fi
@@ -140,14 +138,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,7 +151,7 @@ check_file() {
         log SUCS "$NAME" "$FILENAME" "$HELP"
         ;;
 
-    1 | 2)
+    1)
         if "$MOVABLE"; then
             log ERR "$NAME" "$FILENAME" "$HELP"
         else
@@ -171,16 +167,22 @@ check_file() {
     esac
 }
 
+decode_string() {
+    tmp="${1#\"}" # Trim leading quote
+    tmp="${tmp%\"}" # Trim traling quote
+    printf "%s" "$(echo "$tmp" | sed -e 's/\\n/\
+/g' -e 's/\\\"/\"/g')" # Replace \n with literal newline and \" with "
+}
+
 # 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"
+    while IFS="
+" read -r name; read -r filename; read -r movable; read -r help; do
+        check_file "$(decode_string "$name")" "$(decode_string "$filename")" "$movable" "$(decode_string "$help")"
     done <<EOF
-$(jq -rc '.files[]' "$PROGRAM")
+$(jq '.files[] as $files | .name, $files.path, $files.movable, $files.help' "$PROGRAM")
 EOF
 }