ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 01:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test' of https://github.com/urbit/urbit into test

Browse Source 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/gall.hoon
This commit is contained in:
C. Guy Yarvin 2015-01-20 15:03:35 -08:00
commit b586484f88
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arvo/dill.hoon
View File

@ -326,7 +326,7 @@
=. mos :_(mos [hen %pass tea %g %took [our /terminal] our])
?> ?=(%term-line +>-.sih)
=. +>.$
=+ lis=?-(-.+.sih %rust (scag 1.000 r.q.sih), %rush r.q.sih)
=+ lis=(scag 1.000 r.q.sih)
=- (furl (zing (turn (flop lis) -)))
|= a=tark
^- wall

1
arvo/eyre.hoon
View File

@ -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)

1
main/app/poke/core.hook
View File

@ -7,6 +7,7 @@
++ pock-poke-args
|= [ost=bone @ a=type b=?(mess [her=ship mess])]
=- :_(+>.$ [ost %pass / %g %mess -]~)
^- [p=[ship path] q=ship r=cage]
?^ |2.b [[her p]:b our -.q.b (slot 29 [a b])] :: +.&3
[[our p.b] our -.q.b (slot 13 [a b])] :: +.&2
::

1
main/app/shell/core.hook
View File

@ -450,6 +450,7 @@
::
%out
?. ?=(?(%rust %rush) +<.sih) +>.$
=> .(+<.sih %rush)
?: ?=(%prompt p.sih)
?: (~(has by pip) cil) +>.$
=. pot (~(put by pot) cil (,[cord prom cord] q.sih))

8
main/app/terminal/core.hook
View File

@ -18,7 +18,6 @@
== ::
++ gift ::
$% [%rush gilt] ::
[%rust gilt] ::
[%init p=@p] ::
[%logo @] ::
[%mean p=ares] ::
@ -51,7 +50,6 @@
[%logo @] ::
[%mean p=ares] ::
[%nice ~] ::
[%rust p=%term-line q=term-line] ::
[%rush p=%term-line q=term-line] ::
[%sage p=path q=*] ::
[%verb ~] ::
@ -119,8 +117,8 @@
mow
:_ mow
?- gal
%term [ost %give %rust %hymn page] :: hymn front end
%lines [ost %give %rust %term-line tel] :: term-line output
%term [ost %give %rush %hymn page] :: hymn front end
%lines [ost %give %rush %term-line tel] :: term-line output
==
==
::
@ -175,7 +173,7 @@
%resp
?+ +<.sih !!
%nice +>.$
?(%rust %rush)
%rush
=. p.q.sih ?^(q.q.sih p.tel p.q.sih) :: XX prompt hack
%_ +>.$
mow :- [ost %pass [%resp pax] %g %took [our.hid [auc imp.hid]] you]