Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk

gen/glass.hoon

@@ -124,7 +124,7 @@
       ?.  ?=({$hoon *} tyl)  hav
       :_(hav [(flop `path`t.tyl) [%hoon .^(@t %cx pax)]])
   ::
-  =/  all  (~(tap by dir.lon) ~)
+  =/  all  ~(tap by dir.lon)
   |-  ^+  hav
   ?~  all  hav
   $(all t.all, hav ^$(tyl [p.i.all tyl]))

lib/write.hoon

@@ -53,8 +53,11 @@
   |=  dif/plan-diff  ^+  abet
   ?.  =(our src)
     ~|(foreign-write+[our=our src=src] !!)
+  =/  sev
+    =+  .^(path %e /(scot %p our)/serv/(scot %da now))
+    ?>(?=({@tas @tas *} -) -)
   =;  sob/soba:clay
-    ?~(sob abet abet:(emit %info write+~ our `toro:clay`[q.byk %& sob]))
+    ?~(sob abet abet:(emit %info write+~ our `toro:clay`[i.t.sev %& sob]))
   =+  pax=`path`/web/plan
   =+  paf=(en-beam beak-now (flop pax))
   ?~  [fil:.^(arch %cy paf)]

sys/vane/ames.hoon

@@ -1556,19 +1556,20 @@
       ..^$(fox old)
     ::
     ++  scry
-      |=  {fur/(unit (set monk)) ren/@tas who/ship syd/desk lot/coin tyl/path}
+      |=  {fur/(unit (set monk)) ren/@tas why/shop syd/desk lot/coin tyl/path}
       ^-  (unit (unit cage))
+      ?.  ?=($& -.why)  [~ ~]
       ?~  tyl  [~ ~]
       =+  hun=(slaw %p i.tyl)
       ?~  hun  [~ ~]
       ?.  =(`@`0 ren)  ~
       ?+    lot  ~
           {$$ $ud @}
-        (perm who u.hun q.p.lot [syd t.tyl])
+        (perm p.why u.hun q.p.lot [syd t.tyl])
       ::
           {$$ $da @}
         ?.  =(now q.p.lot)  ~
-        (temp who u.hun [syd t.tyl])
+        (temp p.why u.hun [syd t.tyl])
       ==
     ::
     ++  stay  fox
@@ -1673,7 +1674,7 @@
           :+  (scot %p p.p.kyz)
             (scot %p q.p.kyz)
           q.kyz
-      [hen %pass pax %g %deal p.kyz %hood %poke %wyll !>(wyl)]~
+      [hen %pass pax %g %deal p.kyz %hood %poke %will !>(wyl)]~
     ?:  ?=($wegh -.kyz)
       ~&  %ames-weighing
       [[hen %give %mass wegh]~ +>]
@@ -1734,17 +1735,17 @@
     ^-  (unit (unit cage))
     ?~  tyl  ~
     ?:  ?=({$name $~} tyl)
-      =+  wul=$(tyl [%wyll ~])
+      =+  wul=$(tyl [%will ~])
       :+  ~  ~
       :-  %noun
       !>(?~(wul (scot %p his) (gnow:title his q.q.q:((hard deyd) -.u.wul))))
     ?:  ?=({$gcos $~} tyl)
-      =+  wul=$(tyl [%wyll ~])
+      =+  wul=$(tyl [%will ~])
       ?~(wul ~ ``[%noun !>(`gcos`q.q.q:((hard deyd) -.u.wul))])
     =+  gys=(~(us go ton.fox) our)
     ?~  gys  ~
     ?.  =(our his)
-      ?:  ?=({$wyll $~} tyl)
+      ?:  ?=({$will $~} tyl)
         =+  fod=(~(get by hoc.saf.u.gys) his)
         ?~  fod  ~
         %+  bind  (rick mar his lew.wod.u.fod)
@@ -1760,7 +1761,7 @@
       ``[%noun !>(`buck`[u.muc u.luw])]
     ?:  ?=({$code $~} tyl)
       ``[%noun !>((end 6 1 (shaf %pass (shax sec:ex:q:sen:u.gys))))]
-    ?:  ?=({$wyll $~} tyl)
+    ?:  ?=({$will $~} tyl)
       (bind (rick mar our law.saf.u.gys) |=(a/wyll `[%noun !>(a)]))
     ~
   ::

sys/vane/eyre.hoon

@@ -2160,6 +2160,8 @@
   ?.  ?=($$ ren)  [~ ~]
   ?.  ?=($$ -.lot)  [~ ~]
   ?+    syd  [~ ~]
+      $serv
+    ``[%path !>((en-beam top))]
       $host
     %-  (lift (lift |=(a/hart [%hart !>(a)])))
     ^-  (unit (unit hart))