Merge remote-tracking branch 'origin/jm/homebase' into philip/tomb

CONTRIBUTING.md

@@ -216,7 +216,7 @@ Hoon kernel (anything under [`pkg/arvo/sys/`][sys]) is bootstrapped from a
 so-called *pill*, and must be recompiled if any changes are made. This should
 happen automatically when you make changes, but if it doesn't, the command to
 manually recompile and install the new kernel is `|reset` in `dojo`.  This
-rebuilds from the `sys` directory in the `home` desk in `%clay`.
+rebuilds from the `sys` directory in the `base` desk in `%clay`.
 
 Currently, `|reset` does not reload apps like `dojo` itself, which will still
 reference the old kernel. To force them to reload, make a trivial edit to their

MAINTAINERS.md

@@ -326,7 +326,7 @@ separate releases.
 (**Note**: the following steps are automated by some other Tlon-internal
 tooling.  Just ask `~nidsut-tomdun` for details.)
 
-For Urbit OS updates, this means copying the files into ~zod's %home desk.  The
+For Urbit OS updates, this means copying the files into ~zod's %base desk.  The
 changes should be merged into /~zod/kids and then propagated through other galaxies
 and stars to the rest of the network.
 
@@ -335,10 +335,10 @@ For consistency, I create a release tarball and then rsync the files in.
 ```
 $ wget https://github.com/urbit/urbit/archive/urbit-os-vx.y.tar.gz
 $ tar xzf urbit-os-vx.y.tar.gz
-$ herb zod -p hood -d "+hood/mount /=home="
-$ rsync -zr --delete urbit-urbit-os-vx.y/pkg/arvo/ zod/home
-$ herb zod -p hood -d "+hood/commit %home"
-$ herb zod -p hood -d "+hood/merge %kids our %home"
+$ herb zod -p hood -d "+hood/mount /=base="
+$ rsync -zr --delete urbit-urbit-os-vx.y/pkg/arvo/ zod/base
+$ herb zod -p hood -d "+hood/commit %base"
+$ herb zod -p hood -d "+hood/merge %kids our %base"
 ```
 
 For Vere updates, this means simply shutting down each desired ship, installing

nix/pkgs/pill/solid.sh

@@ -18,45 +18,45 @@ cleanup () {
 trap cleanup EXIT
 
 # Update pill strategy to ensure correct staging
-herb ./pier -p hood -d "+hood/mount /=home="
+herb ./pier -p hood -d "+hood/mount /=base="
 
-until [ -d ./pier/home ]; do
+until [ -d ./pier/base ]; do
   sleep 1
 done
 
 # Update :lens, :dojo and dependencies
 # FIXME: reduce this list
-cp $ARVO/app/lens.hoon   ./pier/home/app/
-cp $ARVO/app/dojo.hoon   ./pier/home/app/
-cp $ARVO/lib/plume.hoon  ./pier/home/lib/
-cp $ARVO/lib/server.hoon ./pier/home/lib/
-cp $ARVO/lib/sole.hoon   ./pier/home/lib/
-cp $ARVO/lib/xray.hoon   ./pier/home/lib/
-cp $ARVO/lib/pprint.hoon ./pier/home/lib/      
+cp $ARVO/app/lens.hoon   ./pier/base/app/
+cp $ARVO/app/dojo.hoon   ./pier/base/app/
+cp $ARVO/lib/plume.hoon  ./pier/base/lib/
+cp $ARVO/lib/server.hoon ./pier/base/lib/
+cp $ARVO/lib/sole.hoon   ./pier/base/lib/
+cp $ARVO/lib/xray.hoon   ./pier/base/lib/
+cp $ARVO/lib/pprint.hoon ./pier/base/lib/      
 
-mkdir -p ./pier/home/mar/lens/
+mkdir -p ./pier/base/mar/lens/
 
-cp $ARVO/mar/lens/*      ./pier/home/mar/lens/
+cp $ARVO/mar/lens/*      ./pier/base/mar/lens/
 
-cp $ARVO/sur/lens.hoon   ./pier/home/sur/
-cp $ARVO/sur/plum.hoon   ./pier/home/sur/
-cp $ARVO/sur/sole.hoon   ./pier/home/sur/
-cp $ARVO/sur/xray.hoon   ./pier/home/sur/
+cp $ARVO/sur/lens.hoon   ./pier/base/sur/
+cp $ARVO/sur/plum.hoon   ./pier/base/sur/
+cp $ARVO/sur/sole.hoon   ./pier/base/sur/
+cp $ARVO/sur/xray.hoon   ./pier/base/sur/
 
 # Update +solid and its dependencies
-cp $ARVO/lib/pill.hoon   ./pier/home/lib/
-cp $ARVO/gen/solid.hoon  ./pier/home/gen/
+cp $ARVO/lib/pill.hoon   ./pier/base/lib/
+cp $ARVO/gen/solid.hoon  ./pier/base/gen/
 
-chmod -R u+rw ./pier/home/
+chmod -R u+rw ./pier/base/
 
-herb ./pier -p hood -d "+hood/commit %home"
-herb ./pier -p hood -d "+hood/unmount %home"
+herb ./pier -p hood -d "+hood/commit %base"
+herb ./pier -p hood -d "+hood/unmount %base"
 
 # FIXME: 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/merge %stage our %base'
 herb ./pier -p hood -d "+hood/mount /=stage="
 
 until [ -d ./pier/stage ]; do