mason.updates: revert bad code
							parent
							
								
									ae2c2909af
								
							
						
					
					
						commit
						a4f509dee9
					
				| 
						 | 
				
			
			@ -1,15 +1,9 @@
 | 
			
		|||
! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
 | 
			
		||||
! See http://factorcode.org/license.txt for BSD license.
 | 
			
		||||
USING: bootstrap.image.download combinators.short-circuit
 | 
			
		||||
io.directories io.launcher kernel mason.common mason.platform ;
 | 
			
		||||
USING: bootstrap.image.download io.directories io.launcher
 | 
			
		||||
kernel mason.common mason.platform ;
 | 
			
		||||
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"
 | 
			
		||||
| 
						 | 
				
			
			@ -19,13 +13,7 @@ IN: mason.updates
 | 
			
		|||
        "master"
 | 
			
		||||
    } ;
 | 
			
		||||
 | 
			
		||||
: pristine-git ( -- )
 | 
			
		||||
    ".git/index" delete-file
 | 
			
		||||
    git-reset-cmd short-running-process
 | 
			
		||||
    git-clean-cmd short-running-process ;
 | 
			
		||||
 | 
			
		||||
: updates-available? ( -- ? )
 | 
			
		||||
    pristine-git
 | 
			
		||||
    git-id
 | 
			
		||||
    git-pull-cmd short-running-process
 | 
			
		||||
    git-id
 | 
			
		||||
| 
						 | 
				
			
			@ -35,4 +23,4 @@ IN: mason.updates
 | 
			
		|||
    boot-image-name maybe-download-image ;
 | 
			
		||||
 | 
			
		||||
: new-code-available? ( -- ? )
 | 
			
		||||
    { [ updates-available? ] [ new-image-available? ] } 0|| ;
 | 
			
		||||
    updates-available? new-image-available? or ;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue