the subject line for apatch/note was improperly quoted. Reference: /n/atom/patch/applied/apatchnotesfix Date: Mon Feb 24 23:32:44 CET 2014 Signed-off-by: quanstro@quanstro.net --- /rc/bin/apatch/apply Mon Feb 24 23:31:54 2014 +++ /rc/bin/apatch/apply Mon Feb 24 23:31:54 2014 @@ -24,7 +24,7 @@ if(~ $u quanstro@quanstro.net) u=() - @{cd $PD/applied/$1 && $patch/diffemail ; echo ------; cat $errs} | + @{builtin cd $PD/applied/$1 && $patch/diffemail && echo ------ && cat $errs} | mail -s 'applied patch: '^$PD/applied/$1 $M $u rm -f $errs } --- /rc/bin/apatch/·apply Mon Feb 24 23:31:55 2014 +++ /rc/bin/apatch/·apply Mon Feb 24 23:31:56 2014 @@ -30,7 +30,7 @@ must dircp $d /n/dist/dist/patch/$1 } d=/n/dist/dist/patch/$1 -must cd $d +must builtin cd $d echo -n merge... >[1=2] fn xxx { --- /rc/bin/apatch/create Mon Feb 24 23:31:58 2014 +++ /rc/bin/apatch/create Mon Feb 24 23:31:58 2014 @@ -51,7 +51,7 @@ for(i in `{cleanname $rooted}) test -e $i && changed=($changed $i) || removed=($removed $i) if(! ~ $#changed 0) - changed=`{find $changed || fail file collection errors} + changed=`{find -D $changed || fail file collection errors} if(echo $changed | grep -s '(^[01258769kqv]\.)|(\.a?[01258769kqv]$)'){ echo there are object or library files. clean it first >[1=2] exit fail --- /rc/bin/apatch/diff Mon Feb 24 23:31:59 2014 +++ /rc/bin/apatch/diff Mon Feb 24 23:32:00 2014 @@ -20,7 +20,7 @@ mountfs d=$PD/$1 -cd $d || fail no dir $d +builtin cd $d || fail no dir $d fn mkdiff { if(test -e $2.orig){ --- /rc/bin/apatch/notify Mon Feb 24 23:32:01 2014 +++ /rc/bin/apatch/notify Mon Feb 24 23:32:02 2014 @@ -4,7 +4,7 @@ . /rc/bin/apatch/defs mountfs -cd $PD || fail no $PD +builtin cd $PD || fail no $PD for(i in [a-zA-Z]*){ if(! test -e $i/diffs && test -e $i/done ){ echo new patch $i >[1=2] --- /rc/bin/apatch/undo Mon Feb 24 23:32:03 2014 +++ /rc/bin/apatch/undo Mon Feb 24 23:32:04 2014 @@ -9,7 +9,7 @@ mountdist -w d=/n/dist/dist/$patch/$1 -must cd $d +must builtin cd $d fn xxx { if(test -e $2.backup){ --- /rc/bin/apatch/readfile Mon Feb 24 23:32:05 2014 +++ /rc/bin/apatch/readfile Mon Feb 24 23:32:06 2014 @@ -2,8 +2,8 @@ if(~ `{cat /proc/$pid/fd | awk 'NR==2{print $NF}'} */dev/cons && test -w /dev/consctl){ >/dev/consctl { echo holdon - cat + cat >> $1 } } if not - cat + cat >> $1 --- /rc/bin/apatch/·sorry Mon Feb 24 23:32:07 2014 +++ /rc/bin/apatch/·sorry Mon Feb 24 23:32:07 2014 @@ -19,7 +19,7 @@ } echo /dist/patch/$1 -$patch/readfile >> $d/notes +must $patch/readfile $d/notes echo moving to sorry ... >[1=2] mkdir $PD/sorry/$1 && dircp $PD/$1 $PD/sorry/$1 && rm -r $PD/$1 echo done>[1=2] --- /rc/bin/apatch/·note Mon Feb 24 23:32:08 2014 +++ /rc/bin/apatch/·note Mon Feb 24 23:32:09 2014 @@ -25,11 +25,13 @@ oldnotes=() fn putback sigint { + echo reverting notes >[1=2] rm $d/notes if(! ~ $#oldnotes 0){ cp -x $oldnotes $d/notes # chmod +a $d/notes } + exit } echo /dist/patch/$1 @@ -38,7 +40,7 @@ oldnotes = /tmp/oldnotes must cp -x $d/notes $oldnotes } -$patch/readfile >> $d/notes +must $patch/readfile $d/notes cu=`{ls -m $d/notes | sed 's/\[(.*)\].*/\1/g'} { echo - $cu --- /rc/bin/apatch/note Mon Feb 24 23:32:10 2014 +++ /rc/bin/apatch/note Mon Feb 24 23:32:11 2014 @@ -12,14 +12,14 @@ if($patch/·note $* |[2] tee $errs){ echo noted. emailing... u=`{cat $PD/$1/email|grep -v '^-$'} - cu=`{ls -m $PD/$1/notes | sed 's/\[(.*)\].*/\1/g'} # gross if(~ $u quanstro@quanstro.net) u=() - +M=quanstro +u=() @{builtin cd $PD/$1 && $patch/diffemail && echo ------ && cat $errs} | - mail -s 'new note from $cu^: '^$PD/applied/$1 $M $u + mail -s 'new note from '^$cu^': '^$PD/$1 $M $u rm -f $errs }