summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscop <scop@e10066b5-e1e2-0310-b819-94efdf66514b>2008-01-01 11:27:06 +0000
committerscop <scop@e10066b5-e1e2-0310-b819-94efdf66514b>2008-01-01 11:27:06 +0000
commit3121bb8929c30c3f9ee85b77e1038a50fdb957f6 (patch)
treec0c1905cd3d2d496bdb976e99c4d8ee9dda6a123
parente8f9c537b82934cdacf0c1c2126e4e02f06a10a5 (diff)
downloadvdr-plugin-muggle-3121bb8929c30c3f9ee85b77e1038a50fdb957f6.tar.gz
vdr-plugin-muggle-3121bb8929c30c3f9ee85b77e1038a50fdb957f6.tar.bz2
Improve temp file handling.
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@965 e10066b5-e1e2-0310-b819-94efdf66514b
-rwxr-xr-xscripts/image_convert.sh15
1 files changed, 9 insertions, 6 deletions
diff --git a/scripts/image_convert.sh b/scripts/image_convert.sh
index c2532cd..18a9813 100755
--- a/scripts/image_convert.sh
+++ b/scripts/image_convert.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# requires: ...topnm, pnmscale, pnmcomp, ppmntsc, ppmtoy4m, mpeg2enc
+# requires: ...topnm, pnmscale, pnmcomp, ppmntsc, ppmtoy4m, mpeg2enc, mktemp
#
# video format. pal or ntsc
@@ -15,7 +15,7 @@ else
TH=512
fi
-TMP=/tmp/image_convert.$$.pnm
+TMP=$(mktemp ${TMPDIR:-/tmp}/image_convert.pnm.XXXXXX) || exit 2
IMG=$1
MPG=$2
@@ -23,6 +23,13 @@ DIR=`dirname "$MPG"`
if [ ! -d "$DIR" ]; then
mkdir -p "$DIR"
fi
+
+trap cleanup EXIT
+cleanup()
+{
+ [ -z "$TMP" ] || rm -f "$TMP"
+}
+
#
# get the file type and set the according converter to PNM
#
@@ -74,7 +81,3 @@ else
ppmtoy4m -v 0 -n 1 -r -S 420mpeg2 -F 25:1 | \
mpeg2enc -f 7 -T 90 -F 3 -np -a 2 -v 0 -o "$MPG"
fi
-#
-# cleanup
-#
-rm $TMP