migrate from tempfile to mktemp

[etc/mutt.git] / .mutt / bgrun

diff --git a/.mutt/bgrun b/.mutt/bgrun
index f1ad14ce95c31c23489534b541f0e9fd31a374d9..ad432dfc8b8ea892e86c6b9045adb83de755afb3 100755 (executable)
--- a/.mutt/bgrun
+++ b/.mutt/bgrun
@@ -10,12 +10,9 @@ TEMPRUNDIR=.tempdir-run.d
 cleanup() {
   if [ -d $TEMPRUNDIR ]; then
     local TEMPDIR; TEMPDIR="$PWD"
 cleanup() {
   if [ -d $TEMPRUNDIR ]; then
     local TEMPDIR; TEMPDIR="$PWD"

-    echo Cleaning up tempdir $TEMPDIR… >> output.stderr

     notify_output
     cd /
     rm -rf "$TEMPDIR"
     notify_output
     cd /
     rm -rf "$TEMPDIR"

-  else
-    notify_output

   fi
   trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
 }
   fi
   trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
 }


@@ -80,13 +77,13 @@ notify_output() {
 }
 
 guess_extension() {
 }
 
 guess_extension() {

-  python -c "import mimetypes; print(mimetypes.guess_extension('$1'))"
+  python3 -c "import mimetypes; print(mimetypes.guess_extension('$1'))"

 }
 
 get_file() {
   local t
   if [ -z "$1" ]; then
 }
 
 get_file() {
   local t
   if [ -z "$1" ]; then

-    t=$(TMPDIR="$PWD" tempfile -s $(guess_extension "$MIMETYPE"))
+    t=$(mktemp -p "$PWD" tmp.XXXXXXXXXX.$(guess_extension "$MIMETYPE"))

     cat > "$t"
     echo "$t"
   else
     cat > "$t"
     echo "$t"
   else


@@ -141,7 +138,7 @@ case "$SELF" in
     (
       ts=$(($(date +%s) + $DELAY))
       launch_viewer "$FILE" "$MIMETYPE"
     (
       ts=$(($(date +%s) + $DELAY))
       launch_viewer "$FILE" "$MIMETYPE"

-      while [ $(date +%s) -lt $ts ]; do sleep $DELAY; done
+      while [ $(date +%s) -lt $ts ]; do sleep 1; done

       cleanup
     ) &
     trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
       cleanup
     ) &
     trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15


@@ -174,9 +171,8 @@ case "$SELF" in
     (launch_viewer "$FILE" "$MIMETYPE") &
     (
       while [ $(($(stat -c%X "$FILE") + $DELAY)) -gt $(date +%s) ]; do
     (launch_viewer "$FILE" "$MIMETYPE") &
     (
       while [ $(($(stat -c%X "$FILE") + $DELAY)) -gt $(date +%s) ]; do

-        sleep $DELAY
+        sleep 1

       done
       done

-      echo Cleaning up $TMPDIR… > $TMPDIR/output.stderr

       cleanup
     ) &
     trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
       cleanup
     ) &
     trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15