From 649ccb033ca2b122d9f0422dac95185ca8cf9582 Mon Sep 17 00:00:00 2001
From: dozens <dozens@tilde.team>
Date: Sat, 3 Feb 2024 17:53:22 -0700
Subject: [PATCH] updates

- remove zx
- parameterize the date for pdf and ingredient scripts
---
 README.md              |  23 +++++++-----
 bin/ingredients.sh     |  24 +++++++++++++
 bin/pdf.sh             |  80 +++++++++++++++++++++++++++++++++++++++++
 dist/2024-01-29-02.pdf | Bin 11933 -> 11934 bytes
 dist/2024-02-05-09.pdf | Bin 12008 -> 12016 bytes
 justfile               |  78 ++--------------------------------------
 6 files changed, 120 insertions(+), 85 deletions(-)
 create mode 100644 bin/ingredients.sh
 create mode 100644 bin/pdf.sh

diff --git a/README.md b/README.md
index ce0c1d9..0974d39 100644
--- a/README.md
+++ b/README.md
@@ -79,18 +79,23 @@ lunch: chipotle bowl
 dinner: Lemon Couscous w Salmon and roast broccoli
 ```
 
-the justfile contains scrips for creating a `.rem` file for remind(1).
-(from there you can use the `rem2ics` utility to create a calendar file,
-or `rem2ps` to create a pdf.)
-it also can create a simple pdf menu via groff and tbl.
-finally it print a list of ingredients needed for next week's menu
-so you can plan your shoping.
+Scrips:
+
+- the justfile contains scrips for creating a `.rem` file for remind(1).
+  (from there you can use the `rem2ics` utility to create a calendar file,
+  or `rem2ps` to create a pdf.)
+
+- `/bin/pdf.sh`
+  will create a simple pdf menu via groff and tbl.
+
+- `/bin/indredients.sh`
+  will print a list of ingredients based on the week's menu
+  so you can plan your shoping.
 
 ## YOU WILL NEED
 
 - recutils
 - groff
-- zx
 
 ## GETTING STARTED
 
@@ -103,7 +108,7 @@ so you can plan your shoping.
 
 This might eventually become part of the backend for supervegan.neocities.org
 
-- [ ] remove zx dep (i thought it would make dates easier in the beginning)
-- [ ] parameterize the date for which the week should be calculated.
+- [x] remove zx dep (i thought it would make dates easier in the beginning)
+- [x] parameterize the date for which the week should be calculated.
 - [ ] quantity for recipe ingredient?
 - [ ] yield for recipe?
diff --git a/bin/ingredients.sh b/bin/ingredients.sh
new file mode 100644
index 0000000..5c3a369
--- /dev/null
+++ b/bin/ingredients.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+if [ $# -eq 0 ]
+then
+  begin=$(gdate -d'Last Sun')
+  end=$(gdate -d'Last Sun +6 days')
+else
+  mydate=$1
+  shift
+  begin=`gdate -d "$mydate -$(gdate --date="$mydate" +%u) days"`
+  end=`gdate -d "$begin" -d'+7 days'`
+fi
+
+recsel db/menu.rec -e "date >> '$begin'" \
+| recsel -e "date << '$end'" -P breakfast,lunch,dinner -C \
+| sort \
+| uniq \
+| xargs -I % recsel db/recipes.rec \
+    -t meal \
+    -j recipe \
+    -e "name = '%'" \
+    -G name \
+    -P recipe_ingredient \
+| sort
+
diff --git a/bin/pdf.sh b/bin/pdf.sh
new file mode 100644
index 0000000..20b7962
--- /dev/null
+++ b/bin/pdf.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env sh
+if [ $# -eq 0 ]
+then
+  mydate=$(gdate)
+else
+  mydate=$1
+  shift
+fi
+
+
+firstday=`gdate -d "$mydate -$(gdate --date="$mydate" +%u) days" +%F`
+lastday=`gdate -d "$firstday +6 days" +%F`
+firstdayout=`gdate -d"$firstday +1 days" +%F`
+lastdayout=`gdate -d"$firstday +5 days" +%d`
+firstdaygroff=`gdate -d"$firstday +1 days" +"%B %_d, %Y"`
+lastdaygroff=`gdate -d"$firstday +5 days" +"%B %_d, %Y"`
+
+
+tmpl=$(
+cat<<EOF
+.ce
+.I
+chez brun
+.sp 2
+.LP
+.ps 14
+${firstdaygroff} - ${lastdaygroff}
+.ps
+.sp 3
+.LP
+.TS
+center expand tab(;);
+l | lp+2 lp+2 lp+2 lp+2 lp+2 
+- | - - - - -
+l | l l l l l.
+;Monday;Tuesday;Wednesday;Thursday;Friday
+Breakfast;T{
+$(
+recsel db/menu.rec -e "date >> '$firstday'" \
+| recsel -e "date << '$lastday'" \
+| recsel -p breakfast \
+| recfmt '.ad l
+{{breakfast}}
+T};T{
+'
+)
+T}
+.sp
+Lunch;T{
+$(
+recsel db/menu.rec -e "date >> '$firstday'" \
+| recsel -e "date << '$lastday'" \
+| recsel -p lunch \
+| recfmt '.ad l
+{{lunch}}
+T};T{
+'
+)
+T}
+.sp
+Dinner;T{
+$(
+recsel db/menu.rec -e "date >> '$firstday'" \
+| recsel -e "date << '$lastday'" \
+| recsel -p dinner \
+| recfmt '.ad l
+{{dinner}}
+T};T{
+'
+)
+T}
+.TE
+EOF
+)
+
+
+echo "$tmpl" \
+| groff -t -ms -Tpdf -d paper=letterl -P-pletterl \
+> dist/"$firstdayout"-"$lastdayout".pdf
+
diff --git a/dist/2024-01-29-02.pdf b/dist/2024-01-29-02.pdf
index ebaeb0e96733c1b22bebbf3851f855c42af34e80..91d44b46411e6bbe12cee70de717198ac89379b7 100644
GIT binary patch
delta 769
zcmbOmJ1=&^N=D;}tK>w^nC1p+W-W~s%?u5-6;R;Zov`KH#5+>;{$4JLkJpL2Y-li6
z+E9MI{0rM^j#4i<4IL-WNtr$zjVoN{UyorfJw11_`^l$eZLXVIUa)eWIpm!*#VTX1
z{o(mX6@RlwR~wz)FOVCvFX!^>sXNx}Dq>u{x#e1f$<<jxw%Nk7gLCW~TIV+isy$%5
zHnTZC>A<WT3;3ijt(-FBvp_wIdIbMR-e2jdmwqI3@;iFW5H5;v@m>)b60l}P*8MdT
z=Wj|@4p#|@u)6nX=j7nltt#_uyw93CvTk}R@3)QDYiWdY<n29trYjzv^APY!wEOY;
zZ(3dV1J2%%b4lk47Th!qS`cr(QOHm<!F9@VspDQpw%#`LwYh2$ru6dOT!Dux>yK>|
z(iBS)%kVeto2s!uk<a<%%01uS-21-ier)-v+s|Td>eSu6Dtn5_=jDZ&t~E95=ie#u
z<d<Er$+~vmeffh9L6MtFSuZb5U*LTp<m1kbO$9m?2IgT!y-ODrCr@1xQEX|xEtgqt
z6X&b`$)0?Z`R>2?UGzs#?zYrB4X$In!qt1~&)wQtF?V_KM=Rs!k4p8<9ew>Kxa!cp
z^*aq`&i$4@=fZXSeb39DyB(6udHQPS$6(daz$cgQKass4e!Va=)cpRrXEzIfz240n
zAzJu}>$Z;BhV6xU3DKrJ<wZjORjkA>Z}WZUEi_w2dsE4+nJ1@w{k466|67Fzr{uN1
zYDn74oDp*5TDSb8@Gt(W`FF)8|7J>OH#RgkF)}rroXKnhV{cx=d{|S|P{9BM6!H|f
zzzjn}69a?EExOkACTKDSMux^_=wd)aF~rOaj4||@8Jn7;>oqquFhUozG&3@Wi1ERl
XWME)nY&h9R&y&NLOI6j?-;E0Zh;2H_

delta 739
zcmbOiJ2!U1N=BoJtK>vxXWv>Dbj548)}>XesuUcA$_{3noOnm7zMtDA@$ouwmkkZZ
zN*l_rmw#bfEl}#UPE@Rs<s^?<i$lbM^VxX~yPlpqdH6?>^<kwrryor$X$MseePp&=
zoB#0qqY3|-b4xd!-Y<|BvoGiJ>!~}|>?)ddHS&;z&a5oo&Usrq-)OF~Yhaz<AgK0$
z@!HDf>l@WfG!C~FXsJH4VK`XNY35wz{4esB%CCq+&3qiiPJG=3oTlAeU813HyG=g@
zSLHnEV&U>W9&J-zv}(h|Ba@eR?p4#!jsEvAWUJ#!k!+3ETC1ITvvwE?u>{ZH|5vqt
z`hBMgC*`TdGmO{p?shBs@>(rSVVOyoOXaG<H4b-n<Qg9d?oDQ$^zJUF;JhrEdhH2G
zjA^$jK$5fAEI5`d|Fmm!_5IUz<!3eXtBXUIUVObSFJPJBQs;EBiy!ya6<t=fEotz2
zzvX9LJqveX<ju9(Gjwd3W0{t9o$nQGNj~`XPQ*#xX<g@fLnkF2etPG|Hr|Q@YAfvh
z%<O!uY8Jmg{n5Q5Cws?akA7*jPZe{w))#-Y@_+uQH0|8c*D-UtuispLrlmICIQw$e
zt^I{g@&A9!3$->EJQpx^-Mra$sWHzg&Hnn{W2`Ndoj#@X^V?NAwtn@s<qWHBy5bXO
zyNP`Zof3It8t>t`bB@?|p8L5ack*u`cQe1wCNs;@j8gahd;31wnq$YOb}w76WBlx!
zT_(Kd%>2{xk9n);oo|!>Fr~8_85)}y85mE_Vzz;?H?L(rtSM@sU;qLNc?w)$hM}Rc
zrRC&SU28_;$p>|XZB5bS4NQzoF~rOajE&LNnHig!O%~J>)-*(yu{1L>LKiczFgBR%
QtLMpK#HFh0>hHz{03Me&2mk;8

diff --git a/dist/2024-02-05-09.pdf b/dist/2024-02-05-09.pdf
index 0ac633b893c946b65339de8b4b2a8fd0771ded09..6ef456dd6e7acc78dd88352e0cb1c6010ea4e8a0 100644
GIT binary patch
delta 904
zcmaD6`yqD1ih46sE;~D};*z4&#9Xe5IeSA-=gkffxO;#7jHSA!+rRVXTsE7!sAM9W
zX7?)Yp3b*Z+z&Zx{QcEe8K1LjlMYMM>6ymq?__3_KRECqV|}8N#hu4Ly(B^dgxRcZ
z_D?R~@zt|`O5eg$mlw2pOC~>1fAV>5N#o<U+=u>ts92dOy6#|oy=oWNdx;nM6So|^
z{vms7|Gz_O>o0xH|M1>0uKeNIxmNeSzLdG>qIrGks<YRYObGcNQ!Z%4`jh>IfA$W+
zUA~)zd{(^teD+IX$49?pH_s%kmTbSJ1`AXczjN_i{>Xh=UNgT+@s`4sQ-s3)NlEGH
z$!5*Co$JKCe$k><>BkjQq}jvj&)dd$ywXZMxH$I~dq!$R@Sjun!z<4pn)*`fH2>Kk
zZ`0c@i7V!K$bbJko4-G$&B;7rWuJ2U)EPE&*QmNk_-%b1x#DM((~{FGS8r{dwO-Z5
zxH0#cSk}I20?HPleaQ=-WphqDyr!y8<Mheey?4Iw%9^J<dVJf4>)#%eG%>!XbA0Qq
zHgk1tsw{pqX<~_!=-=m)Z@lI5c&N*DY1N%AYFB1?<t|-)%IMVEmP4Xb7Dum}7GV0e
zVEyy}Zb#d->!x4OFlkG<?tMctu<DV|zIH9%@9DN>P4cZRzYj-;9TUvi6xJ5>qcp<k
z)sHp(dS17xpDtRmS02dt{%6sW+W10+Ip4m%u2=L;x08^v=9h34d8$}{aA&CVyodYQ
z+cU({3Tq;w|NmY%^R!F8gselY#`g`Jk9IUD+|`?qvDw8a%R$hX*ZKW)QyUl0X@{n-
z(Q>j`7^e_%?!U+pceW|_@{Thxn!PId&we$1?^c~(>A}Sx<5-W@=~Z&XPn(kvv4yoH
zC?G8`@whg>p3UnSw^wcEo~EpG|LvkZ8|Gf|&FpNs+<E`Z&!4AHE(p(&nA-nD{-#%;
z(_}a1barDya}#3&gUMT%ZD8!p-<c0-ikTTJ7=VC6o&pz`VQ6S#VKn)?u2sFc8Jd)V
zk&&SVx|oTvF@~6#p&^D|GZSM=biL-L7AELomgWYgU@?A#n+yyr4UH#H*Yn^sH|0`Q
Jb@g}S0syhEgnIx0

delta 896
zcmewm`yzJ2ih5IXE;~D};*z4&#9Xe5IeSA-=gkffxO;#74Ap6~ZvST6mO0xiaF<8(
z6xXY)$BvYpQhum7rLOjPf}Hs5bvmb+7Ct;P)405EX8D5yAFkhBJf&dA@z+xgRxMEE
z*;Y}j{=PtZf}Cco^VIc@-2Fz!6g*Bow|>cZ{J3}v`^AUX8idy>)K{o>as8hlkuzb-
zQS%R{Zyv2rjJ<O6l{w4z8SDFBzMX7k^Yv-W#Wc<Hi&w3_HdSKhyQCDZZvG4N9Sjye
zU~8Ljzf~>u$dozReoGA&s4TuWWpDDoiRrUHB(s{YGn1Pd)FixS!P7^VmbO(MKW0@S
zJ6-mU#P#KOc0928UZA*gc?)a5d41&k1yd747Bi^dxaxZT(A3P`CGWawrC+T`V^`*x
zD*W<sWF7Z|iDv>V5_7JWJ{9mhaoJNx^-#eo+xt#ulQk#GEuVKyEKAP2GmXjpxb793
zX+p{tq3g02KHDgAJ2A|jeah2w`{MI{HTJO^eSDTH*j^tO)yy@$=$zW*!b6*~?$6m#
zpQ181;OPI2Kg*(>*zyZ!T)n!>c;U5>tkp5Gp@oT}BJ&o=+%4MLv`V(Ud~Z_}$E)np
zy-jWl4OMo>9b7E9RR7$S>J^(a%C9A>{|NNha(n;NP@%(C?^85d|MPjfO`h}hqN`{1
z`j{zOz8`k={5>;%%9i=sdM%fC*4<6Nd4~OP!gJ30#T}b&iR<rJBc)OF=i7s%GmC9J
zziGd&w&y9H`GR+|bH=x;eAf~uO%X_&%_@{T&BKjXBWYRUjK7=O+AYo+|Cn?=wME>7
zo8|P^`G=kyXt=cdafHGF$GP+VFZi`)`!v`8In{diUvIc`R+azd=}Eyp-R2E`T&r#L
z-u^k*nl4)$E&o=z=`F|U^4mK!a@A$GZ*e*F@>u@&KYyO4T+}vObISb_|Aj8kyvcsd
z>Fh>^#wMl)CX@Ft+rZeH|1%%b6f-qdFaQCCJOwT=!_d&g++^}~U8{OC3p6PMBO^lt
zbTJcSV+=7fLjw%GW+ujl=z7gf&CSroEX^#<!D9RfHyIdM8kkO=ujj#OX3nLm>gw;t
F1pvGkiH!gN

diff --git a/justfile b/justfile
index b102af1..7010490 100644
--- a/justfile
+++ b/justfile
@@ -16,85 +16,11 @@ rem:
 
 # build menu pdf from menu.rec
 pdf:
-  #!/usr/bin/env zx
-  const curr = new Date()
-  const firstday = new Date(curr.setDate(curr.getDate() - curr.getDay()));
-  const lastday = new Date(curr.setDate(curr.getDate() - curr.getDay()+6));
-  const options = {
-    year: "numeric",
-    month: "long",
-    day: "numeric",
-  };
-  const rec = await $`recsel db/menu.rec -e ${'date >> "' + firstday + '"'}`.quiet()
-    .pipe($`recsel -e ${'date << "' + lastday + '"'}`).quiet()
-  const bkfst = await $`echo ${rec}`.quiet()
-    .pipe($`recsel -p breakfast`).quiet()
-    .pipe($`recfmt '.ad l
-  {{{{breakfast}}
-  T};T{
-  '`).quiet()
-  const lunch = await $`echo ${rec}`.quiet()
-    .pipe($`recsel -p lunch`).quiet()
-    .pipe($`recfmt '.ad l
-  {{{{lunch}}
-  T};T{
-  '`).quiet()
-  const dinner = await $`echo ${rec}`.quiet()
-    .pipe($`recsel -p dinner`).quiet()
-    .pipe($`recfmt '.ad l
-  {{{{dinner}}
-  T};T{
-  '`).quiet()
-  const firstdaygroff = new Date(firstday.setDate(firstday.getDate()+1 - firstday.getDay())).toLocaleString('en-US', options);
-  const lastdaygroff = new Date(lastday.setDate(lastday.getDate() - lastday.getDay()+5)).toLocaleString('en-US', options);
-  const tmpl=`
-  .ce
-  .I
-  chez brun
-  .sp 2
-  .LP
-  .ps 14
-  ${firstdaygroff} - ${lastdaygroff}
-  .ps
-  .sp 3
-  .LP
-  .TS
-  center expand tab(;);
-  l | lp+2 lp+2 lp+2 lp+2 lp+2 
-  - | - - - - -
-  l | l l l l l.
-  ;Monday;Tuesday;Wednesday;Thursday;Friday
-  Breakfast;T{
-  ${bkfst}
-  T}
-  .sp
-  Lunch;T{
-  ${lunch}
-  T}
-  .sp
-  Dinner;T{
-  ${dinner}
-  T}
-  .TE`
-  await $`echo ${tmpl}`.quiet()
-    .pipe($`groff -t -ms -Tpdf -d paper=letterl -P-pletterl > dist/${new Date(firstdaygroff).toISOString().slice(0, 10)}-${new Date(lastdaygroff).toISOString().slice(8,10)}.pdf`)
+  sh bin/pdf.sh
 
 # build menus!
 menu: rem pdf
 
 # shopping list
 shopping:
-  #!/usr/bin/env sh
-  begin=$(gdate -d'next sun')
-  end=$(gdate -d'next sun +7 days')
-  recsel db/menu.rec -e "date >> '$begin'" \
-  | recsel -e "date << '$end'" -P breakfast,lunch,dinner -C \
-  | sort \
-  | uniq \
-  | xargs -I % recsel db/recipes.rec \
-      -t meal \
-      -j recipe \
-      -e "name = '%'" \
-      -G name \
-      -P recipe_ingredient \
-  | sort
+  sh bin/ingredients.sh