Merge branch 'master' of git://factorcode.org/git/erg

core/io/files/files.factor

@@ -173,3 +173,12 @@ PRIVATE>
 
 : file-contents ( path -- str )
     dup <file-reader> swap file-length <sbuf> [ stream-copy ] keep >string ;
+
+: with-file-in ( path quot -- )
+    >r <file-reader> r> with-stream ; inline
+
+: with-file-out ( path quot -- )
+    >r <file-writer> r> with-stream ; inline
+
+: with-file-appender ( path quot -- )
+    >r <file-appender> r> with-stream ; inline

misc/factor.sh

@@ -200,6 +200,12 @@ git_pull_factorcode() {
         check_ret git
 }
 
+http_git_pull_factorcode() {
+        echo "Updating the git repository from factorcode.org..."
+        git pull http://factorcode.org/git/factor.git master
+        check_ret git
+}
+
 cd_factor() {
         cd factor
         check_ret cd
@@ -271,6 +277,7 @@ install() {
         bootstrap
 }
 
+
 update() {
         get_config_info
         git_pull_factorcode
@@ -278,6 +285,13 @@ update() {
         make_factor
 }
 
+http_update() {
+        get_config_info
+        http_git_pull_factorcode
+        make_clean
+        make_factor
+}
+
 update_bootstrap() {
         delete_boot_images
         get_boot_image
@@ -310,6 +324,7 @@ case "$1" in
         self-update) update; make_boot_image; bootstrap;;
         quick-update) update; refresh_image ;;
         update) update; update_bootstrap ;;
+        http-update) http_update; update_bootstrap ;;
         bootstrap) get_config_info; bootstrap ;;
         wget-bootstrap) get_config_info; delete_boot_images; get_boot_image; bootstrap ;;
         *) usage ;;