webapps.mason: different approach

diff --git a/extra/webapps/mason/docs-update/docs-update.factor b/extra/webapps/mason/docs-update/docs-update.factor
index 487a58e2c389e024cca4efff9b80d3a1d7c5911a..648662e0e9d90416133d92841c53f5cd63b4629c 100644 (file)
--- a/extra/webapps/mason/docs-update/docs-update.factor
+++ b/extra/webapps/mason/docs-update/docs-update.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See https://factorcode.org/license.txt for BSD license.
 USING: accessors furnace.actions help.html http.server.responses
-io.directories io.files io.launcher io.pathnames kernel
-mason.config memoize namespaces sequences threads
+io.directories io.files io.files.info io.launcher io.pathnames
+kernel mason.config memoize namespaces sequences threads
 webapps.mason.utils ;
 IN: webapps.mason.docs-update
 
@@ -16,11 +16,17 @@ IN: webapps.mason.docs-update
         "newdocs" make-directory
         "newdocs" [ { "tar" "xfz" } docs-path suffix try-process ] with-directory
 
-        "docs/dev" file-exists? [ "docs/dev" "docs.old" move-file ] when
-        "newdocs/docs" "docs/dev" move-file
+        "docs" file-exists? [ "docs" "docs.old" move-file ] when
+        "newdocs/docs" "docs" move-file
 
         "newdocs" delete-directory
-        "docs.old" file-exists? [ "docs.old" delete-tree ] when
+        "docs.old" file-exists? [
+            "docs.old"
+            directory-entries [ directory? ] filter
+            [ name>> "docs.old" prepend-path ] map
+            "docs" move-files-into
+            "docs.old" delete-tree
+        ] when
 
         \ load-index reset-memoized
     ] with-directory ;