From 26b57eab2f5e2660b8ac403cae15721313ce6833 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Mon, 18 Apr 1988 10:13:57 +0000
Subject: [PATCH] corrected some

---
 distr/How_To    | 19 ++++---------------
 distr/dwalk     |  4 ++--
 distr/echod     |  2 +-
 distr/listall   |  8 ++++----
 distr/listall.d |  2 +-
 distr/mkd       | 20 +++++++++++++++++++-
 distr/mkf       | 13 +++----------
 7 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/distr/How_To b/distr/How_To
index c057e23d5..6386e0bd8 100644
--- a/distr/How_To
+++ b/distr/How_To
@@ -20,19 +20,12 @@ error messages.
 The file f.attf contains mktree error messages and should be compared
 to Exceptions.
 The actions of mktree are quite complicated. It starts in the current
-directory checking out the .distr file, and copying it to the destination
-directory
+directory creating a version in the destination directory.
+Then it reads the .distr file.
 For each file mentioned there it performes certain actions:
 1- Directory	Change to that directory and call yourself recursively.
 2- File
-   a-           Try to do "co -rdistr4 destination_tree/path/destination_file"
-                on succes "chmod +w destination_file" 
-              else
-   b-           Try to do "co destination_tree/destination_file"
-                on succes "chmod +w destination_file" and
-                give message that says "Missing distr4 entry" (or some such). 
-              else
-   c-           I   Does a file LIST exist in this directory AND
+   a-               Does a file LIST exist in this directory AND
                     is the first line of LIST equal to the name of the
                     destination file? If so, try to extract all the files
                     named in the rest of the LIST file and call the program
@@ -40,11 +33,7 @@ For each file mentioned there it performes certain actions:
                     In this manner libraries can be distributed whose members
                     have their own RCS file! 
               else
-                II  try to do "cp file destination_tree/path/destination_file"
-                    on succes give message that says "Missing RCS entry"
-                    (or some such). 
-              else
-   d-
+   b-
               give message that says "Missing entry" (or some such). 
 
 Now you have the tree but not everything is kosher yet.
diff --git a/distr/dwalk b/distr/dwalk
index 60a1485f6..d8754b992 100755
--- a/distr/dwalk
+++ b/distr/dwalk
@@ -1,4 +1,5 @@
 : ${CDIR=.}
+${DD-:} $CDIR
 ${DF-:} $CDIR .distr
 if test ! -r $DESTDIR/$CDIR/.distr
 then
@@ -11,10 +12,9 @@ do
         then
                 ( if cd $i
 		  then 
-			${DD-:} $CDIR $i
 			CDIR=$CDIR/$i
 			export CDIR
-			exec /proj/em/distr/dwalk
+			exec /proj/em/Work/distr/dwalk
 		  else
 			echo ++ Could not access $CDIR/$i
 		  fi
diff --git a/distr/echod b/distr/echod
index 2b2779cee..9fb9840d0 100755
--- a/distr/echod
+++ b/distr/echod
@@ -1 +1 @@
-echo $1/$2
+echo $1
diff --git a/distr/listall b/distr/listall
index c02e9526c..0bacb4932 100755
--- a/distr/listall
+++ b/distr/listall
@@ -1,10 +1,10 @@
 case $# in
-0)	DIR=. ;;
-1)	DIR=$1 ;;
+0)	DESTDIR=. ;;
+1)	DESTDIR=$1 ;;
 *)	echo $0 [directory] ; exit 1 ;;
 esac
 DD=`pwd`/listall.d
 DW=`pwd`/dwalk
-export DD
-cd $DIR
+export DD DESTDIR
+cd $DESTDIR
 $DW
diff --git a/distr/listall.d b/distr/listall.d
index 5f7a22085..d66cf179c 100755
--- a/distr/listall.d
+++ b/distr/listall.d
@@ -1,2 +1,2 @@
-echo "<$1/$2>"
+echo "<$1>"
 ls -bCdx `cat .distr`
diff --git a/distr/mkd b/distr/mkd
index 7000cbcd9..ecd5595b4 100755
--- a/distr/mkd
+++ b/distr/mkd
@@ -1 +1,19 @@
-mkdir $DESTDIR/$1/$2
+case $1 in
+.)	;;
+*)	mkdir $DESTDIR/$1
+	;;
+esac
+p=`pwd`
+cd $DESTDIR/$1
+if `RV $p $p/Distr4 > /dev/null 2>&1`
+then
+	:
+else
+	echo "-- $1 no Distr4 Save Record yet"
+	if `CV $p > /dev/null 2>&1`
+	then
+		:
+	else
+		echo "-- $1 CV failed for some reason"
+	fi
+fi
diff --git a/distr/mkf b/distr/mkf
index ef1a02531..6a343d0a8 100755
--- a/distr/mkf
+++ b/distr/mkf
@@ -1,18 +1,11 @@
-if co -q -rdistr4 $DESTDIR/$1/$2 >/dev/null 2>&1
+if [ -f $DESTDIR/$1/$2 ]
 then
-	chmod +w $DESTDIR/$1/$2
-elif co -q $DESTDIR/$1/$2 >/dev/null 2>&1
-then
-	chmod +w $DESTDIR/$1/$2
-	echo -- $1/$2 no distr4 yet
-elif grep LIST .distr >/dev/null 2>&1 &&
+	:
+elif grep LIST $DESTDIR/$1/.distr >/dev/null 2>&1 &&
      (test "$2" = "`head -1 $DESTDIR/$1/LIST`") >/dev/null 2>&1 &&
      ${DA-false} "$1" "$2"
 then
 :	Fetched library contents one by one and put them together
-elif cp $2 $DESTDIR/$1/$2 >/dev/null 2>&1
-then
-	echo -- $1/$2 no RCS file
 else
 	echo ++ $1/$2 not present
 fi