From be75a6c5d2cd021ca19381e4aa5a8d57b1e29604 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 16 Jan 2015 11:44:55 -0800 Subject: [PATCH 1/4] Added :code, which prints %eyre auth secret --- main/app/code/core.hook | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 main/app/code/core.hook diff --git a/main/app/code/core.hook b/main/app/code/core.hook new file mode 100644 index 000000000..d5b698a4d --- /dev/null +++ b/main/app/code/core.hook @@ -0,0 +1,9 @@ +:: Show passcode +/+ sh-utils +|_ [hide ~] +++ peer ,_`. +++ poke--args + %+ args-into-gate . + =+ pax=/(crip )/code/(crip )/(crip ) + ,_tang/~[leaf/"{<(,@p .^(%a pax))>}"] +-- From 5f1fcad71419ed2b197547d9855c46eec3cb0929 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Sat, 17 Jan 2015 13:55:39 -0800 Subject: [PATCH 2/4] Revert "Tile %smsm, replaced instance in ames with ++hard call" Kept the %ames part. This reverts commit 3dcf69e125a12518e6d0d30a50e3ef79d8819048. Conflicts: urb/urbit.pill urb/zod/arvo/hoon.hoon urb/zod/main/app/bang/core.hook urb/zod/main/app/cat/core.hook --- arvo/hoon.hoon | 9 ++++----- main/app/cat/core.hook | 2 +- main/app/poke/core.hook | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index cfca2c6d6..9bd336959 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -272,7 +272,7 @@ [%smdt p=twig q=tusk] :: [%smdq p=(list beer)] :: assemble string [%smsg p=twig q=tusk] :: gonads - [%smsm p=tile q=twig] :: make sure q is a p + [%smsm p=twig q=twig] :: make sure q is a p :: :::::: compositions [%tsbr p=tile q=twig] :: push bunt: =+(_p q) [%tscl p=tram q=twig] :: p changes, then q @@ -6662,8 +6662,7 @@ :: [%smsm *] :: ;; :+ %tsgr [%ktts %v ~ 1] :: => v=. - :+ %tsls :+ %ktts %a :: =+ ^= a - [%tsgr [%cnzy %v] [%bccm p.gen]] :: =>(v ,{p.gen}) + :+ %tsls [%ktts %a [%tsgr [%cnzy %v] p.gen]] :: =+ a==>(v {p.gen}) :+ %tsls [%ktts %b [%tsgr [%cnzy %v] q.gen]] :: =+ b==>(v {q.gen}) :+ %tsls :: =+ c=(a b) [%ktts %c [%cnhp [%cnzy %a] [%cnzy %b] ~]] :: @@ -8947,7 +8946,7 @@ =+ rev=(plex b) ?~ rev ~ %- some - :+ %smsm a + :+ %smsm ~(clam al a) [%dtkt %dtzz %$ %cx u.rev] ;~(plug hill rood) == @@ -9195,7 +9194,7 @@ :~ [':' (rune col %smcl expi)] ['.' (rune dot %smdt expi)] ['~' (rune sig %smsg expi)] - [';' (rune sem %smsm expo)] + [';' (rune sem %smsm expb)] == == :- '=' diff --git a/main/app/cat/core.hook b/main/app/cat/core.hook index 51cd5a617..e014c7706 100644 --- a/main/app/cat/core.hook +++ b/main/app/cat/core.hook @@ -19,7 +19,7 @@ =+ ark=;;(arch .^(%cy pax)) ?^ q.ark :- leaf/(spud pax) - %+ turn (lore ;;(@t .^(%cx pax))) + %+ turn (lore ;;(,@t .^(%cx pax))) |=(a=cord leaf/(trip a)) ?- r.ark :: handle ambiguity ~ diff --git a/main/app/poke/core.hook b/main/app/poke/core.hook index 24aca97fa..97b45d88f 100644 --- a/main/app/poke/core.hook +++ b/main/app/poke/core.hook @@ -12,6 +12,6 @@ :: ++ pour |= [ost=bone * sih=*] - ~& poke-resp/;;([term term] [&1 &2]:sih) + ~& poke-resp/(,[term term] [&1 &2]:sih) :_(+> [ost %pass / %g %cide %$]~) -- From a6f0a91cadb1f37dc62e68ea055b60f0a975042d Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Sat, 17 Jan 2015 17:31:45 -0800 Subject: [PATCH 3/4] Breach compatibility rc1 --- main/app/shell/core.hook | 3 +-- main/app/terminal/core.hook | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/main/app/shell/core.hook b/main/app/shell/core.hook index 3b070c21a..6aabc83c9 100644 --- a/main/app/shell/core.hook +++ b/main/app/shell/core.hook @@ -10,8 +10,7 @@ :: |% :: ++ axle :: - $: %0 :: version - tiv=? :: typing? + $: tiv=? :: typing? pid=@u :: next process id pax=_`path`/=try= :: working directory act=(unit span) :: active child diff --git a/main/app/terminal/core.hook b/main/app/terminal/core.hook index 6d1217e89..c608659f5 100644 --- a/main/app/terminal/core.hook +++ b/main/app/terminal/core.hook @@ -58,6 +58,36 @@ [%vega p=path] :: == == == -- +:: +:::: from future import wick, pack, pick XX remove on breach or kelvin bump + :: +|% +++ wick :: span format + |= a=@ + ^- (unit ,@ta) + =+ b=(rip 3 a) + =- ?^(b ~ (some (rap 3 (flop c)))) + =| c=tape + |- ^- [b=tape c=tape] + ?~ b [~ c] + ?. =('~' i.b) + $(b t.b, c [i.b c]) + ?~ t.b [b ~] + ?- i.t.b + %'~' $(b t.t.b, c ['~' c]) + %'-' $(b t.t.b, c ['_' c]) + @ [b ~] + == +:: +++ pack :: light path encoding + |= [a=term b=path] ^- span + %+ rap 3 :- (wack a) + (turn b |=(c=span (cat 3 '_' (wack c)))) +:: +++ pick :: light path decoding + |= a=span ^- (unit ,[p=term q=path]) + (rush a (most cab (sear wick urt:ab))) +-- !: :::: helpers :: From 619dfbb5636558d0a7df49e36781116ece21322f Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Sat, 17 Jan 2015 17:55:01 -0800 Subject: [PATCH 4/4] Added eyre a//=code=/ printf --- arvo/eyre.hoon | 1 + 1 file changed, 1 insertion(+) diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index d2123c80c..59272d6be 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -1889,6 +1889,7 @@ =+ rul=(earn pul.p.som.pip) =+ ruf=(earn (erle our pul.p.som.pip(q.q /pul, r ~))) =+ sus=?~(foy.p.som.pip ses q.u.foy.p.som.pip) + ~& auth-request/secret=`cord`lass =+ ham=(noon our sus whu.p.som.pip rul ruf) [~ pip(pez [%fin %ham ham])] ?. =(lass u.pus.p.som.pip)