Change a few more places that relied on old home directory convention

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 1d055a8..0e64097 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -56,4 +56,5 @@ val dispatcherName = "deleuze.hcoop.net"
 fun domtoolDir user =
     case user of
        "domtool" => "/afs/hcoop.net/common/etc/domtool/domtool"
-      | _ => "/afs/hcoop.net/usr/" ^ user ^ "/domtool"
+      | _ => OS.Path.joinDirFile {dir = Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam user),
+                                 file = "domtool"}

diff --git a/scripts/domtool-addacl b/scripts/domtool-addacl
index 6675de0..0e71190 100755 (executable)
--- a/scripts/domtool-addacl
+++ b/scripts/domtool-addacl
@@ -2,4 +2,4 @@
 
 domtool-admin grant $1 user $1
 domtool-admin grant $1 group $1
-domtool-admin grant $1 path /afs/hcoop.net/usr/$1
+domtool-admin grant $1 path `echo ~$1`