File tree Expand file tree Collapse file tree 2 files changed +15
-15
lines changed Expand file tree Collapse file tree 2 files changed +15
-15
lines changed Original file line number Diff line number Diff line change 1
- BINDIR? =/tmp/
2
- MANDIR? =/tmp/
1
+ BINDIR? =/usr/sbin
2
+ MANDIR? =/usr/share/man
3
3
4
4
.PHONY : install uninstall clean test
5
5
@@ -18,13 +18,13 @@ main.1: main.native
18
18
./main.native --help=groff > main.1
19
19
20
20
install : main.native main.1
21
- install -m 0755 main.native ${BINDIR} /xapi-script- storage
21
+ install -m 0755 main.native ${BINDIR} /xapi-storage-script
22
22
mkdir -p ${MANDIR} /man1
23
- install -m 0644 main.1 ${MANDIR} /man1/xapi-script- storage.1
23
+ install -m 0644 main.1 ${MANDIR} /man1/xapi-storage-script .1
24
24
25
25
uninstall :
26
- rm -f ${BINDIR} /xapi-script- storage
27
- rm -f ${MANDIR} /man1/xapi-script- storage.1
26
+ rm -f ${BINDIR} /xapi-storage-script
27
+ rm -f ${MANDIR} /man1/xapi-storage-script .1
28
28
29
29
test :
30
30
@echo No tests implemented yet
Original file line number Diff line number Diff line change @@ -479,18 +479,18 @@ let main ~root_dir ~switch_port =
479
479
info " Received EOF from inotify event pipe"
480
480
>> = fun () ->
481
481
Shutdown. exit 1
482
- | `Ok (Created name )
483
- | `Ok (Moved (Into name )) ->
484
- create switch_port root_dir name
485
- | `Ok (Unlinked name )
486
- | `Ok (Moved (Away name )) ->
487
- destroy switch_port name
482
+ | `Ok (Created path )
483
+ | `Ok (Moved (Into path )) ->
484
+ create switch_port root_dir ( Filename. basename path)
485
+ | `Ok (Unlinked path )
486
+ | `Ok (Moved (Away path )) ->
487
+ destroy switch_port ( Filename. basename path)
488
488
| `Ok (Modified _ ) ->
489
489
return ()
490
- | `Ok (Moved (Move (a , b ))) ->
491
- destroy switch_port a
490
+ | `Ok (Moved (Move (path_a , path_b ))) ->
491
+ destroy switch_port ( Filename. basename path_a)
492
492
>> = fun () ->
493
- create switch_port root_dir b
493
+ create switch_port root_dir ( Filename. basename path_b)
494
494
| `Ok Queue_overflow ->
495
495
sync ~root_dir ~switch_port
496
496
) >> = fun () ->
You can’t perform that action at this time.
0 commit comments