Ensure the trigger file to be removed

[infodrom/musiikki-web.git] / bin / musiikki-rescan

diff --git a/bin/musiikki-rescan b/bin/musiikki-rescan
index 0c912b8..b7316e2 100755 (executable)
--- a/bin/musiikki-rescan
+++ b/bin/musiikki-rescan
@@ -21,9 +21,13 @@ fi
 # during this operation.
 #
 
-if [ -f "${rescan_file}" -a "${rescan_file}" -nt "${cache}" ]
+if [ -f "${rescan_file}" ]
 then
-    rm "${rescan_file}"
-    /usr/sbin/minidlnad -R
-    /usr/sbin/service minidlna restart
+    trap "rm -f ${rescan_file}" INT EXIT QUIT
+
+    if [ "${rescan_file}" -nt "${cache}" ]
+    then
+       /usr/sbin/minidlnad -R
+       /usr/sbin/service minidlna restart
+    fi
 fi