Fix config monitoring and cleanup

1 files changed, 6 insertions, 3 deletions

diff --git a/git-syncd b/git-syncd
index db1d7a5..8b318a6 100755
--- a/git-syncd
+++ b/git-syncd
@@ -55,8 +55,9 @@ log_prefix() {
 git_syncd_watchers=()
 kill_watchers() {
 	for pid in "${git_syncd_watchers}"; do
-		kill -9 "$pid"
-		timeout 10 wait "$pid" || notify-send "Failed to kill git-syncd watcher"
+		kill -9 "$pid" &>/dev/null
+		waitpid -t 10 "$pid" &>/dev/null
+		kill -0 "$pid" &>/dev/null && notify-send "Failed to kill git-syncd watcher"
 	done
 	git_syncd_watchers=()
 }
@@ -76,12 +77,14 @@ load_config() {
 }
 
 load_config
+trap kill_watchers EXIT
 start_watchers
 while true; do
-	file=$(inotifywait --format "%w%f" -e modify,delete,create "$GIT_SYNCD_CONFIG_DIR" 2>/dev/null)
+	file=$(inotifywait --format "%w%f" -e modify,delete "$GIT_SYNCD_CONFIG")
 	if [ ! -z "$file" ]; then
 		mod_path="$(realpath "$file" 2>/dev/null)"
 		config_path="$(realpath "$GIT_SYNCD_CONFIG" 2>/dev/null)"
+		echo "config $mod_path $config_path"
 		if [ "$mod_path" = "$config_path" ]; then
 			kill_watchers
 			load_config