Merge branch 'master' into gradients-new

Author: bynect

Makefile

@@ -94,10 +94,10 @@ endif
 test: test/test clean-coverage-run
 	# Make sure an error code is returned when the test fails
 	/usr/bin/env bash -c 'set -euo pipefail;\
-	./test/test -v | ./test/greenest.awk '
+	TESTDIR=./test ./test/test -v | ./test/greenest.awk '
 
 test-valgrind: test/test
-	${VALGRIND} \
+	TESTDIR=./test ${VALGRIND} \
 		--suppressions=.valgrind.suppressions \
 		--leak-check=full \
 		--show-leak-kinds=definite \

docs/dunst.5.pod

@@ -832,7 +832,7 @@ The body of the notification
 =item C<category>
 
 The category of the notification as defined by the notification spec. See
-https://specifications.freedesktop.org/notification-spec/latest/ar01s06.html.
+https://specifications.freedesktop.org/notification-spec/latest/categories.html.
 
 =item C<desktop_entry>
 

dunstctl

@@ -30,7 +30,7 @@ show_help() {
 	                                    notification with given ID
 	  history-rm ID                     Remove the notification from
 	                                    history with given ID.
-	  is-paused                         Check if pause level is greater than 0
+	  is-paused [-e|--exit-code]        Check if pause level is greater than 0, optionally with exit code instead of text output
 	  set-paused true|false|toggle      Set the pause status
 	  get-pause-level                   Get the current pause level
 	  set-pause-level level             Set the pause level
@@ -117,7 +117,20 @@ case "${1:-}" in
 		fi
 		;;
 	"is-paused")
-		property_get paused | ( read -r _ _ paused; printf "%s\n" "${paused}"; )
+		exit=false
+		case "${2:-}" in
+			-e | --exit-code)
+					exit=true
+				;;
+		esac
+		property_get paused | {
+			read -r _ _ paused
+			if [ "$exit" = "false" ]; then
+				printf "%s\n" "${paused}"
+			elif [ "${paused}" = "false" ]; then
+				exit 1
+			fi
+		}
 		;;
 	"set-paused")
 		[ "${2:-}" ] \

test/test.c

@@ -33,12 +33,8 @@ SUITE_EXTERN(suite_input);
 GREATEST_MAIN_DEFS();
 
 int main(int argc, char *argv[]) {
-        char *prog = realpath(argv[0], NULL);
-        if (!prog) {
-                fprintf(stderr, "Cannot determine actual path of test executable: %s\n", strerror(errno));
-                exit(1);
-        }
-        base = dirname(prog);
+        base = getenv("TESTDIR");
+        base = realpath(base ? base : "./test", NULL);
 
         /* By default do not print out warning messages, when executing tests.
          * But allow, if DUNST_TEST_LOG=1 is set in environment. */
@@ -72,10 +68,7 @@ int main(int argc, char *argv[]) {
         RUN_SUITE(suite_input);
 
         settings_free(&settings);
-
-        base = NULL;
         g_strfreev(configs);
-        free(prog);
 
         // this returns the error code
         GREATEST_MAIN_END();