Normalize vocabulary roots by removing the last path separator so that scaffold tool...

diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index e995876f2627a9da3e8d7ce39c8a14796fe522a8..17df1a13f2878a94b6244ec7f8a78829fbb02bd2 100644 (file)
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -22,7 +22,9 @@ M: bad-developer-name summary
 
 <PRIVATE
 
-: vocab-root? ( string -- ? ) vocab-roots get member? ;
+: vocab-root? ( string -- ? )
+    trim-tail-separators
+    vocab-roots get member? ;
 
 : contains-dot? ( string -- ? ) ".." swap subseq? ;
 

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 9c1dcaef182065b7d192ec3c81111458329cb337..6df810359d0d5babeb3088138be3c180c933d17c 100644 (file)
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -22,6 +22,7 @@ SYMBOL: add-vocab-root-hook
 ] "vocabs.loader" add-startup-hook
 
 : add-vocab-root ( root -- )
+    trim-tail-separators
     [ vocab-roots get adjoin ]
     [ add-vocab-root-hook get-global call( root -- ) ] bi ;