Fixed correct location of exporting ZDOTDIR (#189)

[xdg-ninja.git] / xdg-ninja.sh

diff --git a/xdg-ninja.sh b/xdg-ninja.sh
index f8e12b55b5342c5392e0802b1c2b3e6e4e10b657..8a0ff98ca6c48af2a5c02d4de6cb34cc0fbfe9b1 100755 (executable)
--- a/xdg-ninja.sh
+++ b/xdg-ninja.sh
@@ -63,11 +63,14 @@ help() {
 
     ${FX_ITALIC}--skip-ok${FX_RESET}           ${FX_BOLD}Don't display anything for files that do not exist (default)${FX_RESET}
 
 
     ${FX_ITALIC}--skip-ok${FX_RESET}           ${FX_BOLD}Don't display anything for files that do not exist (default)${FX_RESET}
 

+    ${FX_ITALIC}--skip-unsupported${FX_RESET}  ${FX_BOLD}Don't display anything for files that do not have fixes available${FX_RESET}
+

     """
     printf "%b" "$HELPSTRING"
 }
 
 SKIP_OK=true
     """
     printf "%b" "$HELPSTRING"
 }
 
 SKIP_OK=true

+SKIP_UNSUPPORTED=false

 for i in "$@"; do
     if [ "$i" = "--help" ] || [ "$i" = "-h" ]; then
         help
 for i in "$@"; do
     if [ "$i" = "--help" ] || [ "$i" = "-h" ]; then
         help


@@ -76,6 +79,8 @@ for i in "$@"; do
         SKIP_OK=true
     elif [ "$i" = "--no-skip-ok" ]; then
         SKIP_OK=false
         SKIP_OK=true
     elif [ "$i" = "--no-skip-ok" ]; then
         SKIP_OK=false

+    elif [ "$i" = "--skip-unsupported" ]; then
+        SKIP_UNSUPPORTED=true

     elif [ "$i" = "-v" ]; then
         SKIP_OK=false
     fi
     elif [ "$i" = "-v" ]; then
         SKIP_OK=false
     fi


@@ -136,6 +141,9 @@ decode_string() {
 /' # Replace \n with literal newline and \" with ", normalize number of trailing newlines to 2
 }
 
 /' # Replace \n with literal newline and \" with ", normalize number of trailing newlines to 2
 }
 

+# Counter to keep track of how many files can be moved
+FIXABLE=0
+

 # Function to handle the formatting of output
 log() {
     MODE="$1"
 # Function to handle the formatting of output
 log() {
     MODE="$1"


@@ -147,10 +155,12 @@ log() {
 
     ERR)
         printf '[%b%s%b]: %b%s%b\n' "${FX_BOLD}${FG_RED}" "$NAME" "${FX_RESET}" "${FX_BOLD}${FX_ITALIC}" "$FILENAME" "${FX_RESET}"
 
     ERR)
         printf '[%b%s%b]: %b%s%b\n' "${FX_BOLD}${FG_RED}" "$NAME" "${FX_RESET}" "${FX_BOLD}${FX_ITALIC}" "$FILENAME" "${FX_RESET}"

+        FIXABLE=$((FIXABLE+1))

         ;;
 
     WARN)
         ;;
 
     WARN)

-        printf '[%b%s%b]: %b%s%b\n' "${FX_BOLD}${FG_YELLOW}" "$NAME" "${FX_RESET}" "${FX_BOLD}${FX_ITALIC}" "$FILENAME" "${FX_RESET}"
+        [ "$SKIP_UNSUPPORTED" = false ] &&
+            printf '[%b%s%b]: %b%s%b\n' "${FX_BOLD}${FG_YELLOW}" "$NAME" "${FX_RESET}" "${FX_BOLD}${FX_ITALIC}" "$FILENAME" "${FX_RESET}"

         ;;
 
     INFO)
         ;;
 
     INFO)


@@ -191,7 +201,9 @@ check_file() {
             log WARN "$NAME" "$FILENAME" "$HELP"
         fi
         if [ "$HELP" ]; then
             log WARN "$NAME" "$FILENAME" "$HELP"
         fi
         if [ "$HELP" ]; then

-            log HELP "$NAME" "$FILENAME" "$HELP"
+            if [ "$MOVABLE" = true ] || [ "$SKIP_UNSUPPORTED" = false ]; then
+                log HELP "$NAME" "$FILENAME" "$HELP"
+            fi

         else
             log HELP "$NAME" "$FILENAME" "_No help available._"
         fi
         else
             log HELP "$NAME" "$FILENAME" "_No help available._"
         fi


@@ -206,7 +218,7 @@ do_check_programs() {
 " read -r name; read -r filename; read -r movable; read -r help; do
         check_file "$name" "$filename" "$movable" "$help"
     done <<EOF
 " read -r name; read -r filename; read -r movable; read -r help; do
         check_file "$name" "$filename" "$movable" "$help"
     done <<EOF

-$(jq 'inputs as $input | $input.files[] as $file | $input.name, $file.path, $file.movable, $file.help' "$(realpath "$0" | dirname -)"/programs/* | sed -e 's/^"//' -e 's/"$//')
+$(jq 'inputs as $input | $input.files[] as $file | $input.name, $file.path, $file.movable, $file.help' "$(realpath "$0" | xargs dirname)"/programs/* | sed -e 's/^"//' -e 's/"$//')

 EOF
 # sed is to trim quotes
 }
 EOF
 # sed is to trim quotes
 }


@@ -221,5 +233,9 @@ check_programs() {
     printf "\n"
 }
 
     printf "\n"
 }
 

-

 check_programs
 check_programs

+if [ $FIXABLE -gt 100 ]; then
+    exit 101
+else
+    exit $FIXABLE
+fi