Revert "use tilde paths instead of home append-path."

This reverts commit 8af27125ec0c0966867da7490db53a1cf071de7a.

diff --git a/basis/command-line/command-line.factor b/basis/command-line/command-line.factor
index 39217ce61dd1683a47b5b372ca1f2077f4b50aa7..aeb26c8e5e29336faf73b7389e4d468c4d734aff 100644 (file)
--- a/basis/command-line/command-line.factor
+++ b/basis/command-line/command-line.factor
@@ -24,6 +24,9 @@ SYMBOL: command-line
 : (command-line) ( -- args )
     OBJ-ARGS special-object sift [ alien>native-string ] map ;
 
+: rc-path ( name -- path )
+    home prepend-path ;
+
 : try-user-init ( file -- )
     "user-init" get swap '[
         _ [ ?run-file ] [
@@ -34,14 +37,14 @@ SYMBOL: command-line
     ] when ;
 
 : run-bootstrap-init ( -- )
-    "~/.factor-boot-rc" try-user-init ;
+    ".factor-boot-rc" rc-path try-user-init ;
 
 : run-user-init ( -- )
-    "~/.factor-rc" try-user-init ;
+    ".factor-rc" rc-path try-user-init ;
 
 : load-vocab-roots ( -- )
     "user-init" get [
-        "~/.factor-roots" dup exists? [
+        ".factor-roots" rc-path dup exists? [
             utf8 file-lines harvest [ add-vocab-root ] each
         ] [ drop ] if
         "roots" get [

diff --git a/basis/editors/visual-studio-code/visual-studio-code.factor b/basis/editors/visual-studio-code/visual-studio-code.factor
index 910e07d883cb89385b5393824a26935a20d129df..3b43d7443c5b2b8f7a59ce797a88f213875647fd 100644 (file)
--- a/basis/editors/visual-studio-code/visual-studio-code.factor
+++ b/basis/editors/visual-studio-code/visual-studio-code.factor
@@ -33,7 +33,7 @@ M: linux find-visual-studio-code-invocation
     {
         [ "code" which ]
         [ "Code" which ]
-        [ "~/VSCode-linux-x64/Code" ]
+        [ home "VSCode-linux-x64/Code" append-path ]
         [ "/usr/share/code/code" ]
     } [ [ exists? ] ?1arg ] map-compose 0|| ;
 

diff --git a/basis/tools/scaffold/scaffold-docs.factor b/basis/tools/scaffold/scaffold-docs.factor
index 7c047a59b7434b2d1d2f2c8b304a0ad2739b597a..2667d6b5db071fc3a5d95af1619b941a298ac3b0 100644 (file)
--- a/basis/tools/scaffold/scaffold-docs.factor
+++ b/basis/tools/scaffold/scaffold-docs.factor
@@ -101,16 +101,22 @@ HELP: scaffold-vocab
 { $description "Creates a directory in the given root for a new vocabulary and adds a main .factor file and an authors.txt file." } ;
 
 HELP: scaffold-emacs
-{ $description "Touches the " { $snippet ".emacs" } " file in your home directory and provides a clickable link to open it in an editor." } ;
+{ $description "Touches the .emacs file in your home directory and provides a clickable link to open it in an editor." } ;
 
 HELP: scaffold-factor-boot-rc
-{ $description "Touches the " { $snippet ".factor-boot-rc" } " file in your home directory and provides a clickable link to open it in an editor." } ;
+{ $description "Touches the .factor-boot-rc file in your home directory and provides a clickable link to open it in an editor." } ;
 
 HELP: scaffold-factor-rc
-{ $description "Touches the " { $snippet ".factor-rc" } " file in your home directory and provides a clickable link to open it in an editor." } ;
+{ $description "Touches the .factor-rc file in your home directory and provides a clickable link to open it in an editor." } ;
 
 HELP: scaffold-factor-roots
-{ $description "Touches the " { $snippet ".factor-roots" } " file in your home directory and provides a clickable link to open it in an editor." } ;
+{ $description "Touches the .factor-roots file in your home directory and provides a clickable link to open it in an editor." } ;
+
+HELP: scaffold-rc
+{ $values
+    { "path" "a pathname string" }
+}
+{ $description "Touches the given path in your home directory and provides a clickable link to open it in an editor." } ;
 
 HELP: using
 { $description "Stores the vocabularies that are pulled into the documentation file from looking up the stack effect types." } ;
@@ -131,6 +137,7 @@ ARTICLE: "tools.scaffold" "Scaffold tool"
 "Types that are unrecognized by the scaffold generator will be of type " { $link null } ". The developer should change these to strings that describe the stack effect names instead." $nl
 "Scaffolding a configuration file:"
 { $subsections
+    scaffold-rc
     scaffold-factor-boot-rc
     scaffold-factor-rc
     scaffold-factor-roots

diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index 6add7a9083e1eec9aefb63eb535e77988b71b994..db602ce4e57fc62ddf39b89d0102ad25ec103683 100644 (file)
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -360,18 +360,21 @@ ${example-indent}}
     [ touch-file ]
     [ "Click to edit: " write <pathname> . ] bi ;
 
+: scaffold-rc ( path -- )
+    [ home ] dip append-path scaffold-file ;
+
 : scaffold-factor-boot-rc ( -- )
-    "~/.factor-boot-rc" scaffold-file ;
+    ".factor-boot-rc" scaffold-rc ;
 
 : scaffold-factor-rc ( -- )
-    "~/.factor-rc" scaffold-file ;
+    ".factor-rc" scaffold-rc ;
 
 : scaffold-mason-rc ( -- )
-    "~/.factor-mason-rc" scaffold-file ;
+    ".factor-mason-rc" scaffold-rc ;
 
 : scaffold-factor-roots ( -- )
-    "~/.factor-roots" scaffold-file ;
+    ".factor-roots" scaffold-rc ;
 
 HOOK: scaffold-emacs os ( -- )
 
-M: unix scaffold-emacs ( -- ) "~/.emacs" scaffold-file ;
+M: unix scaffold-emacs ( -- ) ".emacs" scaffold-rc ;

diff --git a/extra/cpu/8080/emulator/emulator.factor b/extra/cpu/8080/emulator/emulator.factor
index 9db998d259a4ee6cba796086a964e27e28c73bfc..adb06e68f09c8e366488f194c8eacd9f75e88ded 100644 (file)
--- a/extra/cpu/8080/emulator/emulator.factor
+++ b/extra/cpu/8080/emulator/emulator.factor
@@ -453,7 +453,7 @@ SYMBOL: rom-root
 
 : rom-dir ( -- string )
     rom-root get [
-        "~/roms" dup exists? [ drop f ] unless
+        home "roms" append-path dup exists? [ drop f ] unless
     ] unless* ;
 
 : load-rom* ( seq cpu -- )

diff --git a/extra/mason/config/config.factor b/extra/mason/config/config.factor
index 971c0aa466f37edae3f438cf52a0eff9a115aab5..04adaaf0e9db8b5116c69b7190091bac1e4a3f4b 100644 (file)
--- a/extra/mason/config/config.factor
+++ b/extra/mason/config/config.factor
@@ -5,7 +5,10 @@ IN: mason.config
 
 ! (Optional) Location for build directories
 SYMBOL: builds-dir
-builds-dir [ "~/builds" ] initialize
+
+builds-dir get-global [
+    home "builds" append-path builds-dir set-global
+] unless
 
 ! Who sends build report e-mails.
 SYMBOL: builder-from
@@ -15,11 +18,13 @@ SYMBOL: builder-recipients
 
 ! (Optional) CPU architecture to build for.
 SYMBOL: target-cpu
-target-cpu [ cpu ] initialize
+
+target-cpu get-global [ cpu target-cpu set-global ] unless
 
 ! (Optional) OS to build for.
 SYMBOL: target-os
-target-os [ os ] initialize
+
+target-os get-global [ os target-os set-global ] unless
 
 ! (Optional) Architecture variant suffix.
 SYMBOL: target-variant
@@ -32,10 +37,12 @@ SYMBOL: builder-debug
 
 ! URL for counter notifications.
 SYMBOL: counter-url
+
 counter-url [ "http://builds.factorcode.org/counter" ] initialize
 
 ! URL for status notifications.
 SYMBOL: status-url
+
 status-url [ "http://builds.factorcode.org/status-update" ] initialize
 
 ! Password for status notifications.
@@ -56,6 +63,7 @@ SYMBOL: docs-directory
 
 ! URL to notify server about new docs
 SYMBOL: docs-update-url
+
 docs-update-url [ "http://builds.factorcode.org/docs-update" ] initialize
 
 ! Boolean. Do we upload package binaries?

diff --git a/extra/mason/release/sign/sign.factor b/extra/mason/release/sign/sign.factor
index 9608bdf7072935744ffbee6fe7a0ceb813be52eb..de25df62685946ee636426b6a18f60fc857b5133 100644 (file)
--- a/extra/mason/release/sign/sign.factor
+++ b/extra/mason/release/sign/sign.factor
@@ -19,9 +19,11 @@ HOOK: cert-path os ( -- path/f )
 
 M: object cert-path f ;
 
-M: macosx cert-path "~/config/mac_app.cer" ;
+M: macosx cert-path
+    home "config/mac_app.cer" append-path ;
 
-M: windows cert-path "~/config/FactorSPC.pfx" ;
+M: windows cert-path
+    home "config/FactorSPC.pfx" append-path ;
 >>
 
 HOOK: sign-factor-app os ( -- )

diff --git a/extra/webapps/mason/backend/backend.factor b/extra/webapps/mason/backend/backend.factor
index 11d6179c8babfdb4b2905017d16dac543a82d267..ad9a66e3d7c532531c53cd9031556fc910b4c7da 100644 (file)
--- a/extra/webapps/mason/backend/backend.factor
+++ b/extra/webapps/mason/backend/backend.factor
@@ -82,7 +82,7 @@ counter "COUNTER" {
 : os/cpu ( builder -- string )
     [ os>> ] [ cpu>> ] bi "/" glue ;
 
-: mason-db ( -- db ) "~/mason.db" <sqlite-db> ;
+: mason-db ( -- db ) home "mason.db" append-path <sqlite-db> ;
 
 : with-mason-db ( quot -- )
     mason-db [ with-transaction ] with-db ; inline

diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index 91b4ad3a3e9d1a8bf24b4201e10a91d632e85d29..a004702d417a3029781dbba19d1e7f3c12c253db 100644 (file)
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -31,7 +31,7 @@ webapps.mason.backend.watchdog
 websites.factorcode ;
 IN: websites.concatenative
 
-: website-db ( -- db ) "~/website.db" <sqlite-db> ;
+: website-db ( -- db ) home "website.db" append-path <sqlite-db> ;
 
 : init-factor-db ( -- )
     mason-db [ init-mason-db ] with-db
@@ -107,9 +107,9 @@ SYMBOLS: key-password key-file dh-file ;
         <pastebin> <factor-recaptcha> <login-config> <factor-boilerplate> website-db <alloy> "paste.factorcode.org" add-responder
         <planet> <login-config> <factor-boilerplate> website-db <alloy> "planet.factorcode.org" add-responder
         <mason-app> <login-config> <factor-boilerplate> website-db <alloy> "builds.factorcode.org" add-responder
-        "~/docs" <help-webapp> "docs.factorcode.org" add-responder
-        "~/cgi" <gitweb> "gitweb.factorcode.org" add-responder
-        "~/irclogs" <static> t >>allow-listings "irclogs.factorcode.org" add-responder
+        home "docs" append-path <help-webapp> "docs.factorcode.org" add-responder
+        home "cgi" append-path <gitweb> "gitweb.factorcode.org" add-responder
+        home "irclogs" append-path <static> t >>allow-listings "irclogs.factorcode.org" add-responder
     main-responder set-global ;
 
 : <factor-secure-config> ( -- config )