mzs: adjust relative paths to match ipreg repo

and fix the usermap so it correctly identifies bare file ownership

diff --git a/Makefile b/Makefile
index 8713afc..ba35646 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -126,9 +126,10 @@ mzs.tar.gz:
 mzs-mws2: mzs.tar.gz
        @echo UNPACK START $$(date +%Y-%m-%d.%H:%M:%S)
        tar xf mzs.tar.gz
-       tar tvf mzs.tar.gz | tar2usermap -mmzs-usermap
-       mv site mzs-mws2
-       touch mzs-mws2
+       tar tvf mzs.tar.gz |\
+       tar2usermap -mmzs-usermap /site/ $$PWD/mzs-mws2/mzs/
+       mkdir -p mzs-mws2
+       mv site mzs-mws2/mzs
        @echo UNPACK DONE $$(date +%Y-%m-%d.%H:%M:%S)
 
 mzs-tidy: mzs-mws2
@@ -136,9 +137,10 @@ mzs-tidy: mzs-mws2
 
 mzs-cvs: mzs-tidy
        @echo SCCS 2 CVS START $$(date +%Y-%m-%d.%H:%M:%S)
-       mv mzs-mws2 mzs
-       sccs2cvs -mmzs-usermap -wadmin mzs mzs-cvs
-       find mzs -depth | xargs rmdir -v
+       sccs2cvs -mmzs-usermap -wadmin mzs-mws2/mzs mzs-cvs
+       mkdir mzs-cvs/www
+       mv mzs-cvs/mzs mzs-cvs/www/mzs
+       find mzs-mws2 -depth | xargs rmdir -v
        @echo SCCS 2 CVS DONE $$(date +%Y-%m-%d.%H:%M:%S)
 
 mzs-git: mzs-cvs
@@ -149,6 +151,7 @@ mzs-clean:
        @echo CLEAN START $$(date +%Y-%m-%d.%H:%M:%S)
        touch site mzs-mws2
        chmod -R u+w site mzs-mws2
-       rm -rf site mzs-mws2
-       rm -rf mzs.tar.gz mzs-cvs mzs-git mzs-log mzs-usermap
+       rm -rf site mzs-mws2 mzs
+       #rm -rf mzs.tar.gz
+       rm -rf mzs-cvs mzs-git mzs-log mzs-usermap
        @echo CLEAN DONE $$(date +%Y-%m-%d.%H:%M:%S)

diff --git a/mzs-cvs-uplift b/mzs-cvs-uplift
index e00143e..8076997 100755 (executable)
--- a/mzs-cvs-uplift
+++ b/mzs-cvs-uplift
@@ -8,7 +8,7 @@ set -e -x
 : CVS 2 GIT START $(date +%Y-%m-%d.%H:%M:%S)
 
 : $B clean empty log messages $D
-find mzs-cvs/mzs -name '*,v' |
+find mzs-cvs/www/mzs -name '*,v' |
        xargs rcsmtlogmsg
 
 : $B git init $D
@@ -17,7 +17,7 @@ cd    mzs-git
 git init
 
 : $B git fast import $D
-find ../mzs-cvs/mzs |
+find ../mzs-cvs/www/mzs |
 cvs-fast-export -w1 -p -s ../mzs-cvs -A ../ipreg-authors |
 git fast-import
 

diff --git a/mzs-pre-uplift b/mzs-pre-uplift
index 93d744c..f51bc78 100755 (executable)
--- a/mzs-pre-uplift
+++ b/mzs-pre-uplift
@@ -18,7 +18,7 @@ set -e -x
 
 : $B correct permissions $D
 chmod -R u+w mzs-mws2
-cd mzs-mws2
+cd mzs-mws2/mzs
 
 : $B remove directories owned by MWS $D
 rm -rf apache