1 files changed, 58 insertions, 46 deletions

diff --git a/scripts/mkipkg b/scripts/mkipkg
index 54651af..7877078 100755
--- a/scripts/mkipkg
+++ b/scripts/mkipkg
@@ -143,10 +143,11 @@ findFile()
     local path=
     if [ $# = 1 ]; then
-        find $1 -type f -o -type b -o -type c -o -type l -o -type d 
+        find $1 -type f -o -type b -o -type c -o -type l
+        find $1 -type d -a -empty
     else
-        find . -type f -o -type b -o -type c -o -type l -o -type d | \
-        sed -e "s,\./\(.*\),\\1,g"
+        find . -type f -o -type b -o -type c -o -type l | \
+            sed -e "s,\./\(.*\),\\1,g"
+        find . -type d -a -empty
     fi
-
 }
 
@@ -165,11 +166,7 @@ expandMaskToList()
     for f in $_list; do
         if [ -d $f ]; then
-            find="`findFile $f`"
-            if [ -z "$find" ]; then
-                find="$f"
-            fi
-            f="$f `findFile $f`"
+            f="`findFile $f`"
         fi
-        _tmpFileList=$f" $_tmpFileList"
+        _tmpFileList="`eval echo $f` $_tmpFileList"
     done
     setVar $2 "$_tmpFileList"
@@ -180,4 +177,7 @@ createFileList()
     local excludeMask
     local includeMask
+    local includemaskpresent=0
+    local excludemaskpresent=0
+
     if (cat $1|grep -q ^FileExcludeMask); then
         excludemaskpresent=1
@@ -194,23 +194,24 @@ createFileList()
     fi
  
-    excludeMask="$excludeMask CONTROL/* usr/share/* CVS/* SCCS/*"
+    _pushd $destdir
+    
+    excludeMask="$excludeMask CONTROL/* usr/share/*"
 
-    if [ $includemaskpresent == 1 ]; then
-        if [ -z "$includeMask" ]; then
-            setVar $2 ""
-            return 0
-        fi
-        _pushd $destdir
-        expandMaskToList "$includeMask" _fileList
-        _popd
-    else
-        _fileList=`cd $destdir && findFile`
+    if [ $includemaskpresent != 1 ]; then
+        includeMask="."
+    fi
+
+    if [ -z "$includeMask" ]; then
+        setVar $2 ""
+        _popd
+        return 0
     fi
 
+    expandMaskToList "$includeMask" _fileList
+
     _excludeList=
     if [ -n "$excludeMask" ]; then
-        _pushd $destdir
         expandMaskToList "$excludeMask" _excludeList
-        _popd
+        _excludeList="$_excludeList `find -name \*CVS\* -o -name \*SCCS\*`"
     fi
 
@@ -225,6 +226,6 @@ createFileList()
         done
         if [ $containedInList = 0 ]; then
-            if [ ! -e $file ]; then
-#                echo "$self: $file not found"
+            if ! [ -e $file -o -L $file ]; then
+                echo "$self: $file not found"
                 missing=1
             fi
@@ -233,4 +234,6 @@ createFileList()
     done
 
+    _popd
+
     if [ $missing = 1 ]; then
         return 1
@@ -253,9 +256,12 @@ substFile()
     if [ ! -e $2 ]; then return 1; fi
 
-    if [ -e $oldfile ]; then
-        newfile=./`echo $1|sed -f $2|sed -e's,^/,,g'`
-        olddir=./`dirname $1`
+    if [ -e $oldfile -o -L $oldfile ]; then
+        newfile=`echo $oldfile|sed -f $2|sed -e's,^/,,g'`
+        olddir=`dirname $oldfile`
+        base=`basename $oldfile`
         newdir=`dirname $newfile`
 
+#        echo >&2 moving $oldfile to $newfile
+
         if [ "$newdir" = "$olddir" ]; then
             return 0
@@ -263,5 +269,5 @@ substFile()
 
         mkdir -p $newdir
-        mv $1 $newfile
+        mv $olddir/$base $newfile
         rmdir -p $olddir 2>/dev/null
     fi
@@ -271,5 +277,5 @@ stripFiles()
 {
     for f in $1; do
-        stripFile $f
+        stripFile ./$f
     done
 }
@@ -278,5 +284,5 @@ substFiles()
 {
     for f in $1; do
-        substFile $f
+        substFile ./$f
     done
 }
@@ -285,6 +291,6 @@ substAndStripFiles()
 {
     for f in $1; do
-        stripFile $f
-        substFile $f $2
+        stripFile ./$f
+        substFile ./$f $2
     done
 }
@@ -294,4 +300,6 @@ installScript()
     if [ -n "$1" -a -f "$1" ]; then
         destfile=`basename $1`
+        filetype=`echo $destfile|cut -d. -f2`
+        if [ -n "$filetype" ]; then destfile=$filetype; fi
         if [ -n "$subst" ]; then
             sed -f $subst < $1 > $ctrldir/$destfile
@@ -310,5 +318,16 @@ if [ $? != 0 ]; then
 fi
 
-cd $destdir; createFileList $control ipkgFileList
+ctrldir=$tempDir/CONTROL
+
+mkdir -p $ctrldir
+
+if [ ! -e $subst ] || [ -z "$subst" ]; then
+    cat $control > $ctrldir/control.new
+else
+    sed -f $subst < $control > $ctrldir/control.new
+fi
+
+createFileList $ctrldir/control.new ipkgFileList
+
 if [ "$?" != "0" ]; then
     echo "$self: ERROR: missing files, not building $control"
@@ -316,6 +335,9 @@ if [ "$?" != "0" ]; then
 fi
 
-( cd $destdir && tar cf - $ipkgFileList 2>/dev/null ) | \
-( cd $tempDir && tar xf - 2>/dev/null )
+
+cat $ctrldir/control.new | egrep -v '^(Files|FileExcludeMask|FileIncludeMask):' > $ctrldir/control
+rm -f $ctrldir/control.new
+
+( cd $destdir && tar -cf - $ipkgFileList 2>/dev/null ) | ( cd $tempDir && tar -xf - 2>/dev/null )
 
 if [ -z "$filesubst" ]; then
@@ -348,14 +370,4 @@ else
 fi
 
-ctrldir=$tempDir/CONTROL
-
-mkdir -p $ctrldir
-
-if [ ! -e $subst ] || [ -z "$subst" ]; then
-    cat $control | egrep -v '^(FileIncludeMask|FileExcludeMask|Files):' > $ctrldir/control
-else
-    sed -f $subst < $control | egrep -v '^(FileIncludeMask|FileExcludeMask|Files):' > $ctrldir/control
-fi
-
 if [ "$buildsize" != "0" ]; then
     echo "Installed-Size: $buildsize" >> $ctrldir/control