sofort.sh: update to reflect recent changes to the directory tree.

1 files changed, 21 insertions, 5 deletions

diff --git a/sofort.sh b/sofort.sh
index 3f1a019..f2d038d 100755
--- a/sofort.sh
+++ b/sofort.sh
@@ -103,7 +103,15 @@ mv include/sofort include/$project || exit 2
 dirs=$(find . -type d)
 
 for d in $dirs; do
-	name=`echo "$d" | sed -e s/sfrt_/$lowerspace/g -e s/sofort/$project/g`
+	case $d in
+		./sofort | ./sofort/* )
+			name=$d
+			;;
+		* )
+			name=`echo "$d" | sed -e s/sfrt_/$lowerspace/g \
+				-e s/sofort/$project/g`
+			;;
+	esac
 
 	if [ "$d" != "$name" ]; then
 		mv "$d" "$name" || exit 2
@@ -114,7 +122,16 @@ done
 files=$(find . -type f)
 
 for f in $files; do
-	name=`echo "$f" | sed -e s/sfrt_/$lowerspace/g -e s/sofort/$project/g`
+	case $(dirname $f) in
+		./sofort | ./sofort/* )
+			name=$f
+			;;
+
+		* )
+			name=`echo "$f" | sed -e s/sfrt_/$lowerspace/g \
+				-e s/sofort/$project/g`
+			;;
+	esac
 
 	if [ "$f" != "$name" ]; then
 		mv "$f" "$name" || exit 2
@@ -141,8 +158,8 @@ for f in $files; do
 done
 
 # seven: sofort
-mv "$dstdir/$project" "$dstdir/sofort" || exit 2
-cp "$srcdir/Makefile.in" "$dstdir"
+cp -p "$srcdir/configure"   "$dstdir"
+cp -p "$srcdir/Makefile.in" "$dstdir"
 
 # eight: finalize
 uppername=`echo "$project" | tr '[:lower:]' '[:upper:]'`
@@ -154,7 +171,6 @@ mv $utilcsrc.tmp $utilcsrc || exit 2
 touch COPYING.$uppername || exit 2
 echo "$project: project description" > README || exit 2
 
-chmod +x sysinfo/host/host.sh || exit 2
 chmod +x sysinfo/version.sh   || exit 2
 chmod +x ./configure          || exit 2