From eaf523e3c244cd55f4010cc13d6a1a0daaaf7d90 Mon Sep 17 00:00:00 2001 From: Logan Allen Date: Wed, 17 Jun 2020 14:27:30 -0400 Subject: [PATCH 1/2] hood: add version %6 for %file-server upgrade --- pkg/arvo/app/hood.hoon | 9 +++++---- pkg/arvo/lib/hood/drum.hoon | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkg/arvo/app/hood.hoon b/pkg/arvo/app/hood.hoon index 9442c102a..a21087724 100644 --- a/pkg/arvo/app/hood.hoon +++ b/pkg/arvo/app/hood.hoon @@ -43,9 +43,9 @@ !: => |% :: ++ hood-old :: unified old-state - {?($1 $2 $3 $4 $5) lac/(map @tas hood-part-old)} + {?($1 $2 $3 $4 $5 $6) lac/(map @tas hood-part-old)} ++ hood-1 :: unified state - {$5 lac/(map @tas hood-part)} :: + {$6 lac/(map @tas hood-part)} :: ++ hood-good :: extract specific =+ hed=$:hood-head |@ ++ $ @@ -140,7 +140,7 @@ `..on-init :: ++ on-save - !>([%5 lac]) + !>([%6 lac]) :: ++ on-load |= =old-state=vase @@ -152,7 +152,8 @@ %2 ((wrap on-load):from-drum:(help hid) %2) %3 ((wrap on-load):from-drum:(help hid) %3) %4 ((wrap on-load):from-drum:(help hid) %4) - %5 `lac + %5 ((wrap on-load):from-drum:(help hid) %5) + %6 `lac == [cards ..on-init] :: diff --git a/pkg/arvo/lib/hood/drum.hoon b/pkg/arvo/lib/hood/drum.hoon index fd1af5db6..119353f00 100644 --- a/pkg/arvo/lib/hood/drum.hoon +++ b/pkg/arvo/lib/hood/drum.hoon @@ -225,10 +225,10 @@ == :: ++ on-load - |= ver=?(%1 %2 %3 %4) + |= ver=?(%1 %2 %3 %4 %5) =< se-abet =< se-view - =? . (lte ver %3) - =. ver %4 + =? . (lte ver %4) + =. ver %5 =. ..on-load =< (se-emit %pass /kiln %arvo %g %sear ~wisrut-nocsub) =< (se-born %home %goad) @@ -244,7 +244,7 @@ =< (se-born %home %file-server) (se-born %home %s3-store) . - ?> ?=(%4 ver) + ?> ?=(%5 ver) => (se-drop:(se-pull our.hid %dojo) | our.hid %dojo) (se-drop:(se-pull our.hid %chat-cli) | our.hid %chat-cli) :: From 08e1abb1396e9fe0673f5696260a9bcf18b2fa0f Mon Sep 17 00:00:00 2001 From: Logan Allen Date: Wed, 17 Jun 2020 14:27:30 -0400 Subject: [PATCH 2/2] hood + apps: fix OTA process for feat/SPA --- pkg/arvo/app/launch.hoon | 11 +++++++++-- pkg/arvo/app/publish.hoon | 17 ++++++++++++++--- pkg/arvo/lib/hood/drum.hoon | 5 +++-- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/pkg/arvo/app/launch.hoon b/pkg/arvo/app/launch.hoon index e3cc433cd..5ceb6296c 100644 --- a/pkg/arvo/app/launch.hoon +++ b/pkg/arvo/app/launch.hoon @@ -52,7 +52,8 @@ ^- (quip card _this) =/ old-state !<(versioned-state old) ?: ?=(%4 -.old-state) - [~ this(state old-state)] + :- [%pass / %arvo %e %disconnect [~ /]]~ + this(state old-state) =/ new-state *state-zero =. new-state %_ new-state @@ -72,7 +73,13 @@ tile-ordering [%chat %publish %links %weather %clock %dojo ~] == :_ this(state [%4 new-state]) - :- [%pass / %arvo %e %disconnect [~ /]] + %+ welp + :~ [%pass / %arvo %e %disconnect [~ /]] + :* %pass /srv %agent [our.bowl %file-server] + %poke %file-server-action + !>([%serve-dir / /app/landscape %.n]) + == + == %+ turn ~(tap by wex.bowl) |= [[=wire =ship =term] *] ^- card diff --git a/pkg/arvo/app/publish.hoon b/pkg/arvo/app/publish.hoon index 62a95a5bb..a96d2c873 100644 --- a/pkg/arvo/app/publish.hoon +++ b/pkg/arvo/app/publish.hoon @@ -71,7 +71,7 @@ ^- (quip card _this) =/ rav [%sing %t [%da now.bol] /app/publish/notebooks] :_ this - :~ [%pass /bind %arvo %e %connect [~ /'publish-view'] %publish] + :~ [%pass /view-bind %arvo %e %connect [~ /'publish-view'] %publish] [%pass /read/paths %arvo %c %warp our.bol q.byk.bol `rav] [%pass /permissions %agent [our.bol %permission-store] %watch /updates] (invite-poke:main [%create /publish]) @@ -108,7 +108,8 @@ :* %pass /invites %agent [our.bol %invite-store] %watch /invitatory/publish == - [%pass / %arvo %e %disconnect [~ /'~publish']] + [%pass /bind %arvo %e %disconnect [~ /'~publish']] + [%pass /view-bind %arvo %e %connect [~ /'publish-view'] %publish] :* %pass /srv %agent [our.bol %file-server] %poke %file-server-action !>([%serve-dir /'~publish' /app/landscape %.n]) @@ -174,7 +175,14 @@ == :: %3 - [cards this(state p.old-state)] + :_ this(state p.old-state) + %+ welp cards + :~ [%pass /bind %arvo %e %disconnect [~ /'~publish']] + [%pass /view-bind %arvo %e %connect [~ /'publish-view'] %publish] + :* %pass /srving %agent [our.bol %file-server] + %poke %file-server-action + !>([%serve-dir /'~publish' /app/landscape %.n]) + == == == :: ++ convert-comment-2-3 @@ -500,6 +508,9 @@ :: [%bind ~] [~ this] + :: + [%view-bind ~] + [~ this] == :: ++ on-fail on-fail:def diff --git a/pkg/arvo/lib/hood/drum.hoon b/pkg/arvo/lib/hood/drum.hoon index 119353f00..71cc5f26d 100644 --- a/pkg/arvo/lib/hood/drum.hoon +++ b/pkg/arvo/lib/hood/drum.hoon @@ -241,10 +241,11 @@ =< (se-born %home %link-proxy-hook) =< (se-born %home %link-listen-hook) =< (se-born %home %link-view) - =< (se-born %home %file-server) - (se-born %home %s3-store) + =< (se-born %home %s3-store) + (se-born %home %file-server) . ?> ?=(%5 ver) + => (se-born %home %file-server) => (se-drop:(se-pull our.hid %dojo) | our.hid %dojo) (se-drop:(se-pull our.hid %chat-cli) | our.hid %chat-cli) ::