ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-29 18:06:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanups

Browse Source
This commit is contained in:
Ted Blackman 2021-09-06 21:59:24 +03:00
parent 5fbaa143d5
commit 18019b3eb4
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/garden-dev/lib/docket.hoon
View File

@ -98,7 +98,7 @@
?+ -.clause "'{(trip +.clause)}'" ?+ -.clause "'{(trip +.clause)}'"
%color (scow %ux color.clause) %color (scow %ux color.clause)
%site (spud path.clause) %site (spud path.clause)
%glob-ames ~& ship+ship.clause "{(scow %p ship.clause)}" %glob-ames (scow %p ship.clause)
:: ::
%version %version
=, version.clause =, version.clause
@ -182,7 +182,6 @@
:: ::
++ charge ++ charge
|= c=^charge |= c=^charge
~! charge+charge
%+ merge (docket docket.c) %+ merge (docket docket.c)
%- pairs %- pairs
:~ chad+(chad chad.c) :~ chad+(chad chad.c)

21
pkg/garden/app/docket.hoon
View File

@ -91,7 +91,8 @@
|= [=ship =desk] |= [=ship =desk]
^- (quip card _state) ^- (quip card _state)
=+ .^(=treaty:treaty %gx (scry:io %treaty /treaty/(scot %p ship)/[desk]/noun)) =+ .^(=treaty:treaty %gx (scry:io %treaty /treaty/(scot %p ship)/[desk]/noun))
?< ~|(%bad-install-desk (~(has by charges) desk)) ?. (~(has by charges) desk)
~|(bad-install-desk+desk !!)
=. charges =. charges
(~(put by charges) desk docket.treaty %install ~) (~(put by charges) desk docket.treaty %install ~)
=* cha ~(. ch desk) =* cha ~(. ch desk)
@ -101,8 +102,7 @@
++ uninstall ++ uninstall
|= =desk |= =desk
^- (quip card _state) ^- (quip card _state)
~| %no-charge-install =/ =charge ~|(no-charge-installed+desk (~(got by charges) desk))
=/ =charge (~(got by charges) desk)
=. charges (~(del by charges) desk) =. charges (~(del by charges) desk)
=? by-base ?=(%glob -.href.docket.charge) =? by-base ?=(%glob -.href.docket.charge)
(~(del by by-base) base.href.docket) (~(del by by-base) base.href.docket)
@ -125,13 +125,11 @@
`state `state
:: ::
[%glob @ ~] [%glob @ ~]
~& path+path =/ desk ~|(path/path (~(got by by-base) i.t.path))
=/ desk (~(got by by-base) i.t.path) =/ =charge ~|(desk/desk (~(got by charges) desk))
=/ =charge (~(got by charges) desk)
~& charge+charge
?> ?=(%glob -.chad.charge) ?> ?=(%glob -.chad.charge)
:_ state :_ state
:~ [%give %fact ~[path] %glob !>(`glob`glob.chad.charge)] :: :~ [%give %fact ~[path] %glob !>(`glob`glob.chad.charge)]
[%give %kick ~[path] ~] [%give %kick ~[path] ~]
== ==
== ==
@ -358,12 +356,13 @@
(poke-our:(pass %uninstall) %hood kiln-uninstall+!>(desk)) (poke-our:(pass %uninstall) %hood kiln-uninstall+!>(desk))
++ new-chad |=(c=chad (~(jab by charges) desk |=(charge +<(chad c)))) ++ new-chad |=(c=chad (~(jab by charges) desk |=(charge +<(chad c))))
++ fetch-glob ++ fetch-glob
=/ =charge (~(got by charges) desk) =/ =charge
~& charge+charge ~| desk/desk
(~(got by charges) desk)
=/ tid=@t (cat 3 'docket-' (scot %uv (sham (mix eny.bowl desk)))) =/ tid=@t (cat 3 'docket-' (scot %uv (sham (mix eny.bowl desk))))
?> ?=(%glob -.href.docket.charge) ?> ?=(%glob -.href.docket.charge)
=* loc glob-location.href.docket.charge =* loc glob-location.href.docket.charge
~& loc+loc ~> %slog.0^leaf/"docket: fetching glob for {<desk>} desk"
=/ =cage spider-start+!>([~ `tid byk.bowl(r da+now.bowl) %glob !>(`[loc desk])]) =/ =cage spider-start+!>([~ `tid byk.bowl(r da+now.bowl) %glob !>(`[loc desk])])
:~ (watch-our:(pass %glob) %spider /thread-result/[tid]) :~ (watch-our:(pass %glob) %spider /thread-result/[tid])
(poke-our:(pass %glob) %spider cage) (poke-our:(pass %glob) %spider cage)