skip edit on from file note

[zpackage] / zpm-note

diff --git a/zpm-note b/zpm-note
index 3ef442a758b9f5217913b18e64750c792c0a2411..57edda00e032ee69bb421c9c1151b6a5b56e6c7b 100755 (executable)
--- a/zpm-note
+++ b/zpm-note
@@ -10,14 +10,14 @@
 # note delete <note> - delete a note from the system
 # note edit <package> [file] - edit or create a note
 
-SPOOL=/var/spool/admin/notes
+SPOOL=/var/lib/admin/notes
 OPEN=$SPOOL/open
 
 set -e
 
-#umask 007
+umask 007
 
-cd $SPOOL || { echo "can't chdir to $SPOOL" ; exit 1; }
+#cd $SPOOL || { echo "can't chdir to $SPOOL" ; exit 1; }
 
 [ -z "$1" ] && set list
 
@@ -65,7 +65,6 @@ case $cmd in
                filedir=$(dirname $subfile)
                mkdir -p $SPOOL/ack/$filedir
                mv $file $SPOOL/ack/$filedir
-               exit 0
                ;;
        new)
                if [ $# -eq 1 ]; then set general $1; fi
@@ -81,8 +80,9 @@ case $cmd in
                                ;;
                        *)
                                tmp=$(mktemp -p $SPOOL/open)
-                               flock -n -E3 $tmp vim $tmp
-                               if [ $? -eq 3 ]; then echo already editing $1; exit 1; fi
+                               cp $1 $tmp
+                               #flock -n -E3 $tmp vim $tmp
+                               #if [ $? -eq 3 ]; then echo already editing $1; exit 1; fi
                                file=$(zpm sequence notes)
                                mv $tmp $SPOOL/open/$pkg/$file || { rm -f $tmp; exit 1; }
                                echo created $file
@@ -94,8 +94,15 @@ case $cmd in
                flock -n -E3 $file vim $file
                if [ $? -eq 3 ]; then echo already editing $1; exit 1; fi
                ;;
+       remove)
+               file=$(findnote $1)
+               rm $file
+               ;;
        show)
                file=$(findnote $1)
                ${PAGER:-less} $file
                ;;
+       *)
+               echo '$0: unknown command ' $cmd 1>&2
+               exit 1
 esac