ipkg-build mkipkg : speedup (avoid grepping over controlfile by loading into array)

SpeciapMTFiles tothreaded : convert control files to -mt.control

1 files changed, 52 insertions, 11 deletions

diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index c6af056..b661bbf 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -1,47 +1,82 @@
 #!/bin/bash
 
 # ipkg-build -- construct a .ipk from a directory
 # Carl Worth <cworth@east.isi.edu>
 # based on a script by Steve Redler IV, steve@sr-tech.com 5-21-2001
 set -e
 
-ipkg_extract_value() {
-        sed -e "s/^[^:]*:[[:space:]]*//"
+#declare array for values and fields found in control file
+declare -a AllValues AllFields
+
+collect_values() {
+      local i line
+
+      i=0
+      while read line
+      do
+        AllFields[$i]=${line%%:*}
+        AllValues[$i]=`echo ${line#*:}` # echo to remove spaces
+        let i=i+1
+      done < ${pkg_dir}/${CONTROL}/control
 }
 
 required_field() {
-        field=$1
-
-        value=`grep "^$field:" < $CONTROL/control | ipkg_extract_value`
-        if [ -z "$value" ]; then
-                echo "*** Error: $CONTROL/control is missing field $field" >&2
-                return 1
-        fi
-        echo $value
-        return 0
+        local field i
+        field=$1
+
+        i=0
+        for af in "${AllFields[@]}"
+        do
+          if [ "$field" = "$af" ]
+          then
+            # return value
+            echo "${AllValues[$i]}"
+            return 0;
+          fi
+          let i=i+1
+        done
+        # not found
+        echo "*** Error: $CONTROL/control is missing field $field" >&2
+        return 1
 }
 
+#ipkg_extract_value() {
+        #sed -e "s/^[^:]*:[[:space:]]*//"
+#}
+#
+#required_field() {
+        #field=$1
+#
+        #value=`grep "^$field:" < $CONTROL/control | ipkg_extract_value`
+        #if [ -z "$value" ]; then
+        #       echo "*** Error: $CONTROL/control is missing field $field" >&2
+        #       return 1
+        #fi
+        #echo $value
+        #return 0
+#}
+
 pkg_appears_sane() {
         local pkg_dir=$1
 
         local owd=`pwd`
         cd $pkg_dir
 
         PKG_ERROR=0
 
         tilde_files=`find . -name '*~'`
         if [ -n "$tilde_files" ]; then
                 echo "*** Warning: The following files have names ending in '~'.
 You probably want to remove them: " >&2
                 ls -ld $tilde_files
                 echo >&2
         fi
 
         large_uid_files=`find . -uid +99`
 
         if [ "$ogargs" = "" ]  && [ -n "$large_uid_files" ]; then
                 echo "*** Warning: The following files have a UID greater than 99.
 You probably want to chown these to a system user: " >&2
                 ls -ld $large_uid_files
                 echo >&2
         fi
@@ -116,82 +151,88 @@ You probably want to chown these to a system user: " >&2
         cd $owd
         return $PKG_ERROR
 }
 
 ###
 # ipkg-build "main"
 ###
 ogargs=""
 outer=ar
 usage="Usage: $0 [-c] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
 while getopts "cg:o:" opt; do
     case $opt in
         o ) owner=$OPTARG
             ogargs="--owner=$owner"
             ;;
         g ) group=$OPTARG
             ogargs="$ogargs --group=$group"
             ;;
         c ) outer=tar
             ;;
                 \? ) echo $usage  >&2
         esac
 done
 
+# maks sure that tar produces headers compatible with busybox format
+# debian needs this
+ogargs="$ogargs --format=oldgnu"
 
 shift $(($OPTIND - 1))
 
 # continue on to process additional arguments
 
 case $# in
 1)
         dest_dir=.
         ;;
 2)
         dest_dir=$2
         ;;
 *)
         echo echo $usage >&2
         exit 1 
         ;;
 esac
 
 pkg_dir=$1
 
 if [ ! -d $pkg_dir ]; then
         echo "*** Error: Directory $pkg_dir does not exist" >&2
         exit 1
 fi
 
 # CONTROL is second so that it takes precedence
 CONTROL=
 [ -d $pkg_dir/DEBIAN ] && CONTROL=DEBIAN
 [ -d $pkg_dir/CONTROL ] && CONTROL=CONTROL
 if [ -z "$CONTROL" ]; then
         echo "*** Error: Directory $pkg_dir has no CONTROL subdirectory." >&2
         exit 1
 fi
 
+# load values 
+collect_values 
+
 if ! pkg_appears_sane $pkg_dir; then
         echo >&2
         echo "ipkg-build: Please fix the above errors and try again." >&2
         exit 1
 fi
 
 tmp_dir=$dest_dir/IPKG_BUILD.$$
 mkdir $tmp_dir
 
 tar $ogargs -C $pkg_dir -czf $tmp_dir/data.tar.gz . --exclude=$CONTROL
 tar $ogargs -C $pkg_dir/$CONTROL -czf $tmp_dir/control.tar.gz .
 
 echo "2.0" > $tmp_dir/debian-binary
 
 pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
 here_dir=$PWD
 ## tar -C $tmp_dir -czf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
 rm -f $pkg_file
 if [ "$outer" = "ar" ] ; then
   cd $tmp_dir ; ar crf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
 else
   cd $tmp_dir ; tar -zcf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
 fi
 cd $here_dir