1 files changed, 9 insertions, 4 deletions

diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index ac8f286..0533048 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -92,103 +92,108 @@ You probably want to chown these to a system user: " >&2
         if [ -n "$bad_fields" ]; then
                 bad_fields=`echo $bad_fields`
                 echo "*** Error: The following fields in $CONTROL/control are missing a ':'" >&2
                         echo "$bad_fields" >&2
                 echo "ipkg-build: This may be due to a missing initial space for a multi-line field value" >&2
                 PKG_ERROR=1
         fi
 
         for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
                 if [ -f $script -a ! -x $script ]; then
                         echo "*** Error: package script $script is not executable" >&2
                         PKG_ERROR=1
                 fi
         done
 
         if [ -f $CONTROL/conffiles ]; then
                 for cf in `cat $CONTROL/conffiles`; do
                         if [ ! -f ./$cf ]; then
                                 echo "*** Error: $CONTROL/conffiles mentions conffile $cf which does not exist" >&2
                                 PKG_ERROR=1
                         fi
                 done
         fi
 
         cd $owd
         return $PKG_ERROR
 }
 
 ###
 # ipkg-build "main"
 ###
 ogargs=""
-usage="Usage: $0 [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
-while getopts ":o:g:" opt; do
+usage="Usage: $0 [-o owner] [-g group] [-c] <pkg_directory> [<destination_directory>]"
+while getopts ":o:g:c" opt; do
     case $opt in
         o ) owner=$OPTARG
             ogargs="--owner=$owner"
             ;;
         g ) group=$OPTARG
             ogargs="$ogargs --group=$group"
             ;;
+        c ) classic=1
+            ;;
                 \? ) echo $usage  >&2
         esac
 done
 
 
 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
 
 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
-cd $tmp_dir ; ar crf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
+if [ -n "$classic" ]; then
+        tar -C $tmp_dir -czf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
+else
+        cd $tmp_dir ; ar crf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz
+fi
 cd $here_dir
 rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
 rmdir $tmp_dir
 
 echo "Packaged contents of $pkg_dir into $pkg_file"