Merge pull request #10 from simonjbeaumont/improvements

Generic fixes #1

Author: djs55

Makefile

@@ -1,5 +1,5 @@
-BINDIR?=/tmp/
-MANDIR?=/tmp/
+BINDIR?=/usr/sbin
+MANDIR?=/usr/share/man
 
 .PHONY: install uninstall clean test
 
@@ -18,13 +18,13 @@ main.1: main.native
 	./main.native --help=groff > main.1
 
 install: main.native main.1
-	install -m 0755 main.native ${BINDIR}/xapi-script-storage
+	install -m 0755 main.native ${BINDIR}/xapi-storage-script
 	mkdir -p ${MANDIR}/man1
-	install -m 0644 main.1 ${MANDIR}/man1/xapi-script-storage.1
+	install -m 0644 main.1 ${MANDIR}/man1/xapi-storage-script.1
 
 uninstall:
-	rm -f ${BINDIR}/xapi-script-storage
-	rm -f ${MANDIR}/man1/xapi-script-storage.1
+	rm -f ${BINDIR}/xapi-storage-script
+	rm -f ${MANDIR}/man1/xapi-storage-script.1
 
 test:
 	@echo No tests implemented yet

main.ml

@@ -479,18 +479,18 @@ let main ~root_dir ~switch_port =
       info "Received EOF from inotify event pipe"
       >>= fun () ->
       Shutdown.exit 1
-    | `Ok (Created name)
-    | `Ok (Moved (Into name)) ->
-      create switch_port root_dir name
-    | `Ok (Unlinked name)
-    | `Ok (Moved (Away name)) ->
-      destroy switch_port name
+    | `Ok (Created path)
+    | `Ok (Moved (Into path)) ->
+      create switch_port root_dir (Filename.basename path)
+    | `Ok (Unlinked path)
+    | `Ok (Moved (Away path)) ->
+      destroy switch_port (Filename.basename path)
     | `Ok (Modified _) ->
       return ()
-    | `Ok (Moved (Move (a, b))) ->
-      destroy switch_port a
+    | `Ok (Moved (Move (path_a, path_b))) ->
+      destroy switch_port (Filename.basename path_a)
       >>= fun () ->
-      create switch_port root_dir b
+      create switch_port root_dir (Filename.basename path_b)
     | `Ok Queue_overflow ->
       sync ~root_dir ~switch_port
     ) >>= fun () ->