X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-note;h=f78bdd81c96861cdae5359b06827ba0155b2f7a4;hb=446d104827d78aaacdeba972a76f8bc490310132;hp=e06336f315fa1181fe1d2b736a3fecf515c6fb84;hpb=6080805504f64986a323cde720f7ac4ab92af5d5;p=zpackage diff --git a/zpm-note b/zpm-note index e06336f..f78bdd8 100755 --- a/zpm-note +++ b/zpm-note @@ -62,6 +62,12 @@ case $cmd in case $1 in -a) find $ZPMSPOOL/ack -type f -printf '%P\n' | sort -n ;; + ?*) if [ -d $ZPMSPOOL/open/$1 ] ; then + find $ZPMSPOOL/open/$1 -type f -printf '%P\n' | sort -n + else + exit 1 + fi + ;; *) find $ZPMSPOOL/open -type f -printf '%P\n' | sort -n ;; esac @@ -93,34 +99,30 @@ case $cmd in tmp=$(mktemp -p $ZPMSPOOL/open) pkg=$1 [ -f $ZPMSPOOL/.template ] && cp $ZPMSPOOL/.template $tmp + #flock -n -E3 $tmp vim $tmp + #if [ $? -eq 3 ]; then echo already editing $1; exit 1; fi ${EDITOR:-vi} $tmp - file=$(zpm sequence notes) - mv $tmp $ZPMSPOOL/open/$pkg/$file || { rm -f $tmp; exit 1; } - echo "$pkg/$file" - exit 0 + else + # take note from file or stdin + pkg=$1 ; shift + mkdir -p $ZPMSPOOL/open/$pkg + case $1 in + '-') + tmp=$(mktemp -p $ZPMSPOOL/open) + cat - > $tmp + ;; + *) + tmp=$(mktemp -p $ZPMSPOOL/open) + cp $1 $tmp + ;; + esac fi - - # take note from file or stdin - pkg=$1 ; shift + file=$(zpm sequence notes) mkdir -p $ZPMSPOOL/open/$pkg - case $1 in - '-') - tmp=$(mktemp -p $ZPMSPOOL/open) - cat - > $tmp - file=$(zpm sequence notes) - mv $tmp $ZPMSPOOL/open/$pkg/$file || { rm -f $tmp ; exit 1; } - echo $file - ;; - *) - tmp=$(mktemp -p $ZPMSPOOL/open) - 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 $ZPMSPOOL/open/$pkg/$file || { rm -f $tmp; exit 1; } - echo $file - ;; - esac + mv $tmp $ZPMSPOOL/open/$pkg/$file || { rm -f $tmp; exit 1; } + # TODO run newhooks in $ZPMSPOOL/.hook/newnote + echo "$pkg/$file" + exit 0 ;; edit) file=$(findnote $1)