-rwxr-xr-x | scripts/mkipkg | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/mkipkg b/scripts/mkipkg index 7877078..9c5e184 100755 --- a/scripts/mkipkg +++ b/scripts/mkipkg | |||
@@ -305,41 +305,43 @@ installScript() | |||
305 | sed -f $subst < $1 > $ctrldir/$destfile | 305 | sed -f $subst < $1 > $ctrldir/$destfile |
306 | else | 306 | else |
307 | cat $1 > $ctrldir/$destfile | 307 | cat $1 > $ctrldir/$destfile |
308 | fi | 308 | fi |
309 | chmod +x $ctrldir/$destfile | 309 | chmod +x $ctrldir/$destfile |
310 | fi | 310 | fi |
311 | } | 311 | } |
312 | 312 | ||
313 | tempDir=/tmp/`basename $self`.$$ | 313 | tempDir=/tmp/`basename $self`.$$ |
314 | mkdir -p $tempDir | 314 | mkdir -p $tempDir |
315 | if [ $? != 0 ]; then | 315 | if [ $? != 0 ]; then |
316 | echo "$self: cannot create $tempDir, exiting..." | 316 | echo "$self: cannot create $tempDir, exiting..." |
317 | rm -rf $tempDir | ||
317 | exit 1 | 318 | exit 1 |
318 | fi | 319 | fi |
319 | 320 | ||
320 | ctrldir=$tempDir/CONTROL | 321 | ctrldir=$tempDir/CONTROL |
321 | 322 | ||
322 | mkdir -p $ctrldir | 323 | mkdir -p $ctrldir |
323 | 324 | ||
324 | if [ ! -e $subst ] || [ -z "$subst" ]; then | 325 | if [ ! -e $subst ] || [ -z "$subst" ]; then |
325 | cat $control > $ctrldir/control.new | 326 | cat $control > $ctrldir/control.new |
326 | else | 327 | else |
327 | sed -f $subst < $control > $ctrldir/control.new | 328 | sed -f $subst < $control > $ctrldir/control.new |
328 | fi | 329 | fi |
329 | 330 | ||
330 | createFileList $ctrldir/control.new ipkgFileList | 331 | createFileList $ctrldir/control.new ipkgFileList |
331 | 332 | ||
332 | if [ "$?" != "0" ]; then | 333 | if [ "$?" != "0" ]; then |
333 | echo "$self: ERROR: missing files, not building $control" | 334 | echo "$self: ERROR: missing files, not building $control" |
335 | rm -rf $tempDir | ||
334 | exit 1 | 336 | exit 1 |
335 | fi | 337 | fi |
336 | 338 | ||
337 | 339 | ||
338 | cat $ctrldir/control.new | egrep -v '^(Files|FileExcludeMask|FileIncludeMask):' > $ctrldir/control | 340 | cat $ctrldir/control.new | egrep -v '^(Files|FileExcludeMask|FileIncludeMask):' > $ctrldir/control |
339 | rm -f $ctrldir/control.new | 341 | rm -f $ctrldir/control.new |
340 | 342 | ||
341 | ( cd $destdir && tar -cf - $ipkgFileList 2>/dev/null ) | ( cd $tempDir && tar -xf - 2>/dev/null ) | 343 | ( cd $destdir && tar -cf - $ipkgFileList 2>/dev/null ) | ( cd $tempDir && tar -xf - 2>/dev/null ) |
342 | 344 | ||
343 | if [ -z "$filesubst" ]; then | 345 | if [ -z "$filesubst" ]; then |
344 | ( cd $tempDir && stripFiles "$ipkgFileList" ) | 346 | ( cd $tempDir && stripFiles "$ipkgFileList" ) |
345 | else | 347 | else |