Merge pull request #1430 from urbit/stage-solid-redux

updates solid pill staging to handle :lens and +solid changes

nix/ops/solid/builder.sh

@@ -15,18 +15,41 @@ cleanup () {
 
 trap cleanup EXIT
 
-# update pill strategy to ensure correct staging
+#  update pill strategy to ensure correct staging
 #
+
 herb ./pier -p hood -d "+hood/mount /=home="
 
-cp $ARVO/app/lens.hoon ./pier/home/app/
-cp $ARVO/lib/pill.hoon ./pier/home/lib/
-chmod -R u+rw ./pier/home/lib/
+#  update :lens, :dojo and dependencies
+#
+#    XX reduce this list
+#
+cp $ARVO/app/lens.hoon   ./pier/home/app/      2>/dev/null || true
+cp $ARVO/app/dojo.hoon   ./pier/home/app/      2>/dev/null || true
+cp $ARVO/lib/base64.hoon ./pier/home/lib/      2>/dev/null || true
+cp $ARVO/lib/server.hoon ./pier/home/lib/      2>/dev/null || true
+cp $ARVO/lib/sole.hoon   ./pier/home/lib/      2>/dev/null || true
+mkdir -p ./pier/home/mar/lens/
+cp $ARVO/mar/lens/*      ./pier/home/mar/lens/ 2>/dev/null || true
+
+cp $ARVO/sur/lens.hoon   ./pier/home/sur/      2>/dev/null || true
+cp $ARVO/sur/sole.hoon   ./pier/home/sur/      2>/dev/null || true
+
+#  update +solid and its dependencies
+#
+cp $ARVO/lib/pill.hoon   ./pier/home/lib/      2>/dev/null || true
+cp $ARVO/gen/solid.hoon  ./pier/home/gen/      2>/dev/null || true
+
+chmod -R u+rw ./pier/home/
 
 herb ./pier -p hood -d "+hood/commit %home"
 herb ./pier -p hood -d "+hood/unmount %home"
 
-# stage new desk for pill contents
+#  XX horrible hack to ensure the update is applied first
+#
+sleep 10
+
+#  stage new desk for pill contents
 #
 herb ./pier -p hood -d '+hood/merge %stage our %home'
 herb ./pier -p hood -d "+hood/mount /=stage="

pkg/arvo/lib/pill.hoon

@@ -97,7 +97,7 @@
   =?  hav  ?=(^ fil.lon)
       ::  XX  this whitelist needs to be reviewed
       ::
-      ?.  ?=  ?($css $hoon $json $md $txt $udon $umd)
+      ?.  ?=  ?($css $hoon $html $js $json $md $png $txt $udon $umd)
           -.tyl
         ::
         ::  install only files with whitelisted marks