1 files changed, 11 insertions, 11 deletions

diff --git a/scripts/mkipkg b/scripts/mkipkg
index 43bd3a3..a336371 100755
--- a/scripts/mkipkg
+++ b/scripts/mkipkg
@@ -181,3 +181,3 @@ createFileList()
 
-    if (cat $1|grep -q ^FileExcludeMask); then
+    if (grep -q ^FileExcludeMask $1); then
         excludemaskpresent=1
@@ -185,3 +185,3 @@ createFileList()
     fi
-    if (cat $1|grep -q ^FileIncludeMask); then
+    if (grep -q ^FileIncludeMask $1); then
         includemaskpresent=1
@@ -189,3 +189,3 @@ createFileList()
     else
-        if (cat $1|grep -q ^Files:); then
+        if (grep -q ^Files: $1); then
             includemaskpresent=1
@@ -197,3 +197,5 @@ createFileList()
     
-    excludeMask="$excludeMask CONTROL/* usr/share/*"
+    declare -a excludeMaskArray
+    excludeMaskArray=( $excludeMask )
+    excludeMaskArray=( "${excludeMaskArray[@]}" "CONTROL/*" "usr/share/*" )
 
@@ -211,7 +213,3 @@ createFileList()
 
-    _excludeList=
-    if [ -n "$excludeMask" ]; then
-        expandMaskToList "$excludeMask" _excludeList
-        _excludeList="$_excludeList `find -name \*CVS\* -o -name \*SCCS\*`"
-    fi
+    excludeMaskArray=( "${excludeMaskArray[@]}" "*/CVS*" "*/SCCS*" )
 
@@ -221,7 +219,9 @@ createFileList()
         local containedInList=0
-        for i in $_excludeList; do
-            if [ $file = $i ]; then
+        for i in "${excludeMaskArray[@]}"; do
+            if [[ $file == $i ]]; then
                 containedInList=1
+                break;
             fi
         done
+
         if [ $containedInList = 0 ]; then