Merge pull request #93 from dokku/53-executable-warning

Log when a plugin trigger is not executable
dokku · May 19, 2022 · f477c30 · f477c30
2 parents ba2f9d3 + 86a2347
commit f477c30
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/bashenv/plugn.bash b/bashenv/plugn.bash
@@ -88,9 +88,13 @@ trigger() {
 	declare hook="$1"; shift
 	shopt -s nullglob
 	for plugin in $PLUGIN_PATH/enabled/*; do
-		if [[ -x "$plugin/$hook" ]]; then
-			eval "$(config-export $(basename $plugin))"
-			$plugin/$hook "$@"
+		if [[ -f "$plugin/$hook" ]]; then
+			if [[ -x "$plugin/$hook" ]]; then
+				eval "$(config-export $(basename $plugin))"
+				$plugin/$hook "$@"
+			else
+				echo "Trigger '$hook' is not executable, skipping plugin ($(basename $plugin))" 1>&2
+			fi
 		fi
 	done
 	shopt -u nullglob

diff --git a/bindata.go b/bindata.go