steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mason.updates: revert bad code

db4
Slava Pestov 2010-06-24 13:45:26 -04:00
parent ae2c2909af
commit a4f509dee9
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extra/mason/updates/updates.factor
View File

@ -1,15 +1,9 @@
! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov. ! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: bootstrap.image.download combinators.short-circuit USING: bootstrap.image.download io.directories io.launcher
io.directories io.launcher kernel mason.common mason.platform ; kernel mason.common mason.platform ;
IN: mason.updates IN: mason.updates
: git-reset-cmd ( -- cmd )
{ "git" "reset" "--hard" "HEAD" } ;
: git-clean-cmd ( -- cmd )
{ "git" "clean" "-f" "-d" "-x" } ;
: git-pull-cmd ( -- cmd ) : git-pull-cmd ( -- cmd )
{ {
"git" "git"
@ -19,13 +13,7 @@ IN: mason.updates
"master" "master"
} ; } ;
: pristine-git ( -- )
".git/index" delete-file
git-reset-cmd short-running-process
git-clean-cmd short-running-process ;
: updates-available? ( -- ? ) : updates-available? ( -- ? )
pristine-git
git-id git-id
git-pull-cmd short-running-process git-pull-cmd short-running-process
git-id git-id
@ -35,4 +23,4 @@ IN: mason.updates
boot-image-name maybe-download-image ; boot-image-name maybe-download-image ;
: new-code-available? ( -- ? ) : new-code-available? ( -- ? )
{ [ updates-available? ] [ new-image-available? ] } 0|| ; updates-available? new-image-available? or ;