Merge branch 'master' of git://factorcode.org/git/factor
commit
e4d50833a7
|
@ -1,7 +1,7 @@
|
|||
|
||||
USING: kernel parser words continuations namespaces debugger
|
||||
sequences combinators prettyprint
|
||||
system io io.files io.launcher sequences.deep
|
||||
sequences combinators splitting prettyprint
|
||||
system io io.files io.launcher io.encodings.utf8 sequences.deep
|
||||
accessors multi-methods newfx shell.parser ;
|
||||
|
||||
IN: shell
|
||||
|
@ -44,6 +44,19 @@ METHOD: expand { glob-expr }
|
|||
|
||||
METHOD: expand { factor-expr } expr>> eval unparse ;
|
||||
|
||||
DEFER: expansion
|
||||
|
||||
METHOD: expand { back-quoted-expr }
|
||||
expr>>
|
||||
expr
|
||||
ast>>
|
||||
command>>
|
||||
expansion
|
||||
utf8 <process-stream>
|
||||
contents
|
||||
" \n" split
|
||||
"" remove ;
|
||||
|
||||
METHOD: expand { object } ;
|
||||
|
||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
|
||||
USING: kernel system sequences io.files io.launcher bootstrap.image
|
||||
http.client
|
||||
builder.util builder.release.branch ;
|
||||
|
||||
IN: update
|
||||
|
@ -23,7 +24,7 @@ IN: update
|
|||
: remote-clean-image ( -- url )
|
||||
"http://factorcode.org/images/clean/" my-boot-image-name append ;
|
||||
|
||||
: download-clean-image ( -- ) { "wget" remote-clean-image } run-command ;
|
||||
: download-clean-image ( -- ) remote-clean-image download ;
|
||||
|
||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
|
|
Loading…
Reference in New Issue