builder: move some words to builder.util

extra/builder/release/release.factor

@@ -1,6 +1,6 @@
 
 USING: kernel system namespaces sequences splitting combinators
-       io io.files io.launcher prettyprint
+       io io.files io.launcher prettyprint bootstrap.image
        bake combinators.cleave builder.common builder.util ;
 
 IN: builder.release
@@ -33,10 +33,6 @@ IN: builder.release
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: cpu- ( -- cpu ) cpu unparse "." split "-" join ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 : base-name ( -- string )
   { "factor" [ os unparse ] cpu- stamp> } to-strings "-" join ;
 
@@ -89,8 +85,6 @@ IN: builder.release
 
 SYMBOL: upload-to-factorcode
 
-: platform ( -- string ) { [ os unparse ] cpu- } to-strings "-" join ;
-
 : remote-location ( -- dest )
   "factorcode.org:/var/www/factorcode.org/newsite/downloads"
   platform
@@ -101,24 +95,59 @@ SYMBOL: upload-to-factorcode
   [ "Error uploading binary to factorcode" print ]
   run-or-bail ;
 
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 : maybe-upload ( -- )
   upload-to-factorcode get
     [ upload ]
   when ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! update-clean-branch
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-! : release ( -- )
-!   "factor"
-!     [
-!       remove-factor-app
-!       remove-common-files
-!     ]
-!   with-directory
-!   make-archive
-!   archive-name releases move-file-into ;
+: branch-name ( -- string )
+  { "clean" [ os unparse ] cpu- } to-strings "-" join ;
+
+: refspec ( -- string ) "master:" branch-name append ;
+
+: push-to-clean-branch ( -- )
+  { "git" "push" "factorcode.org:/git/factor.git" refspec }
+  to-strings
+  try-process ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: upload-clean-image ( -- )
+  {
+    "scp"
+    my-boot-image-name
+    "factorcode.org:/var/www/factorcode.org/newsite/images/clean"
+  }
+  to-strings
+  try-process ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: update-clean-branch ( -- )
+  "factor"
+    [
+      push-to-clean-branch
+      upload-clean-image
+    ]
+  with-directory ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: maybe-update-clean-branch ( -- )
+  upload-to-factorcode get
+    [ update-clean-branch ]
+  when ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : release ( -- )
+  maybe-update-clean-branch
   "factor"
     [
       remove-factor-app

extra/builder/util/util.factor

@@ -2,6 +2,7 @@
 USING: kernel words namespaces classes parser continuations
        io io.files io.launcher io.sockets
        math math.parser
+       system
        combinators sequences splitting quotations arrays strings tools.time
        sequences.deep accessors assocs.lib
        io.encodings.utf8
@@ -94,4 +95,6 @@ USE: prettyprint
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: failsafe ( quot -- ) [ drop ] recover ;
+: cpu- ( -- cpu ) cpu unparse "." split "-" join ;
+
+: platform ( -- string ) { [ os unparse ] cpu- } to-strings "-" join ;