-rwxr-xr-x | scripts/ipkg-build | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/scripts/ipkg-build b/scripts/ipkg-build index 0533048..c6af056 100755 --- a/scripts/ipkg-build +++ b/scripts/ipkg-build | |||
@@ -55,9 +55,9 @@ You probably want to chown these to a system user: " >&2 | |||
55 | 55 | ||
56 | pkg=`required_field Package` | 56 | pkg=`required_field Package` |
57 | [ "$?" -ne 0 ] && PKG_ERROR=1 | 57 | [ "$?" -ne 0 ] && PKG_ERROR=1 |
58 | 58 | ||
59 | version=`required_field Version | sed 's/.*://;'` | 59 | version=`required_field Version | sed 's/Version://; s/^.://g;'` |
60 | [ "$?" -ne 0 ] && PKG_ERROR=1 | 60 | [ "$?" -ne 0 ] && PKG_ERROR=1 |
61 | 61 | ||
62 | arch=`required_field Architecture` | 62 | arch=`required_field Architecture` |
63 | [ "$?" -ne 0 ] && PKG_ERROR=1 | 63 | [ "$?" -ne 0 ] && PKG_ERROR=1 |
@@ -120,19 +120,20 @@ You probably want to chown these to a system user: " >&2 | |||
120 | ### | 120 | ### |
121 | # ipkg-build "main" | 121 | # ipkg-build "main" |
122 | ### | 122 | ### |
123 | ogargs="" | 123 | ogargs="" |
124 | usage="Usage: $0 [-o owner] [-g group] [-c] <pkg_directory> [<destination_directory>]" | 124 | outer=ar |
125 | while getopts ":o:g:c" opt; do | 125 | usage="Usage: $0 [-c] [-o owner] [-g group] <pkg_directory> [<destination_directory>]" |
126 | while getopts "cg:o:" opt; do | ||
126 | case $opt in | 127 | case $opt in |
127 | o ) owner=$OPTARG | 128 | o ) owner=$OPTARG |
128 | ogargs="--owner=$owner" | 129 | ogargs="--owner=$owner" |
129 | ;; | 130 | ;; |
130 | g ) group=$OPTARG | 131 | g ) group=$OPTARG |
131 | ogargs="$ogargs --group=$group" | 132 | ogargs="$ogargs --group=$group" |
132 | ;; | 133 | ;; |
133 | c ) classic=1 | 134 | c ) outer=tar |
134 | ;; | 135 | ;; |
135 | \? ) echo $usage >&2 | 136 | \? ) echo $usage >&2 |
136 | esac | 137 | esac |
137 | done | 138 | done |
138 | 139 | ||
@@ -185,13 +186,14 @@ tar $ogargs -C $pkg_dir/$CONTROL -czf $tmp_dir/control.tar.gz . | |||
185 | echo "2.0" > $tmp_dir/debian-binary | 186 | echo "2.0" > $tmp_dir/debian-binary |
186 | 187 | ||
187 | pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk | 188 | pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk |
188 | here_dir=$PWD | 189 | here_dir=$PWD |
190 | ## tar -C $tmp_dir -czf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz | ||
189 | rm -f $pkg_file | 191 | rm -f $pkg_file |
190 | if [ -n "$classic" ]; then | 192 | if [ "$outer" = "ar" ] ; then |
191 | tar -C $tmp_dir -czf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz | 193 | cd $tmp_dir ; ar crf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz |
192 | else | 194 | else |
193 | cd $tmp_dir ; ar crf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz | 195 | cd $tmp_dir ; tar -zcf $here_dir/$pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz |
194 | fi | 196 | fi |
195 | cd $here_dir | 197 | cd $here_dir |
196 | rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz | 198 | rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz |
197 | rmdir $tmp_dir | 199 | rmdir $tmp_dir |