author | schurig <schurig> | 2003-06-03 11:49:03 (UTC) |
---|---|---|
committer | schurig <schurig> | 2003-06-03 11:49:03 (UTC) |
commit | aaf7709f64dda5a6cb81eeb96e421ba4189654d6 (patch) (side-by-side diff) | |
tree | 2571cb8ae66a1dbc323d813a148dbcb3012f390f | |
parent | 17b5bc4593ab0786f6488d452ae2430d6e4c46a5 (diff) | |
download | opie-aaf7709f64dda5a6cb81eeb96e421ba4189654d6.zip opie-aaf7709f64dda5a6cb81eeb96e421ba4189654d6.tar.gz opie-aaf7709f64dda5a6cb81eeb96e421ba4189654d6.tar.bz2 |
remove $tempDir after an error
-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() sed -f $subst < $1 > $ctrldir/$destfile else cat $1 > $ctrldir/$destfile fi chmod +x $ctrldir/$destfile fi } tempDir=/tmp/`basename $self`.$$ mkdir -p $tempDir if [ $? != 0 ]; then echo "$self: cannot create $tempDir, exiting..." + rm -rf $tempDir exit 1 fi ctrldir=$tempDir/CONTROL mkdir -p $ctrldir if [ ! -e $subst ] || [ -z "$subst" ]; then cat $control > $ctrldir/control.new else sed -f $subst < $control > $ctrldir/control.new fi createFileList $ctrldir/control.new ipkgFileList if [ "$?" != "0" ]; then echo "$self: ERROR: missing files, not building $control" + rm -rf $tempDir exit 1 fi cat $ctrldir/control.new | egrep -v '^(Files|FileExcludeMask|FileIncludeMask):' > $ctrldir/control rm -f $ctrldir/control.new ( cd $destdir && tar -cf - $ipkgFileList 2>/dev/null ) | ( cd $tempDir && tar -xf - 2>/dev/null ) if [ -z "$filesubst" ]; then ( cd $tempDir && stripFiles "$ipkgFileList" ) else |