[yelp-tools] Always pass a template to mktemp for BSD compatibility



commit 5769c06360989f54b44761eb50cb708ea36663e1
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Jul 29 10:07:39 2013 -0400

    Always pass a template to mktemp for BSD compatibility

 tools/yelp-build.in |    8 ++++----
 tools/yelp-check.in |   16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/tools/yelp-build.in b/tools/yelp-build.in
index 4baa589..9be5ac7 100755
--- a/tools/yelp-build.in
+++ b/tools/yelp-build.in
@@ -346,10 +346,10 @@ yelp_html_mal2html () {
         html_cache_file=`(cd $(dirname "$html_cache_file") && pwd)`/`basename "$html_cache_file"`
     else
         html_cache_file_is_tmp="yes"
-        html_cache_file=`mktemp`
+        html_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
         yelp_cache -o "$html_cache_file" "$@"
     fi
-    html_tmp_infile=`mktemp`
+    html_tmp_infile=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
     yelp_cache_in "$@" > "$html_tmp_infile"
     (
         echo '<xsl:stylesheet'
@@ -570,11 +570,11 @@ yelp_epub () {
         epub_cache_file=`(cd $(dirname "$epub_cache_file") && pwd)`/`basename "$epub_cache_file"`
     else
         epub_cache_file_is_tmp="yes"
-        epub_cache_file=`mktemp`
+        epub_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
         yelp_cache -o "$epub_cache_file" "$@"
     fi
     html_cache_file="$epub_cache_file"
-    epub_data_out=`mktemp -d`
+    epub_data_out=`mktemp -d "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
     html_out="$epub_data_out/OPS"
     mkdir "$html_out"
     mkdir "$html_out/yelp"
diff --git a/tools/yelp-check.in b/tools/yelp-check.in
index 31d6545..7498012 100755
--- a/tools/yelp-check.in
+++ b/tools/yelp-check.in
@@ -382,12 +382,12 @@ yelp_links () {
     if [ "x$check_cache_file" != "x" ]; then
         check_cache_file=`(cd $(dirname "$check_cache_file") && pwd)`/`basename "$check_cache_file"`
     fi
-    check_out_file=`mktemp`
+    check_out_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
     for xml in "$@"; do
         if [ -d "$xml" ]; then
             if [ "x$check_cache_file" = "x" ]; then
                 check_cache_file_is_tmp="yes"
-                check_cache_file=`mktemp`
+                check_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
                 yelp-build cache -o "$check_cache_file" "$@"
             fi
             for page in "$xml"/*.page; do
@@ -400,7 +400,7 @@ yelp_links () {
             else
                 if [ "x$check_cache_file" = "x" ]; then
                     check_cache_file_is_tmp="yes"
-                    check_cache_file=`mktemp`
+                    check_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
                     yelp-build cache -o "$check_cache_file" "$@"
                 fi
                 yelp_links_page "$xml"
@@ -468,10 +468,10 @@ yelp_orphans () {
         check_cache_file=`(cd $(dirname "$check_cache_file") && pwd)`/`basename "$check_cache_file"`
     else
         check_cache_file_is_tmp="yes"
-        check_cache_file=`mktemp`
+        check_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
         yelp-build cache -o "$check_cache_file" "$@"
     fi
-    check_out_file=`mktemp`
+    check_out_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
     for xml in "$@"; do
         if [ -d "$xml" ]; then
             for page in "$xml"/*.page; do
@@ -568,7 +568,7 @@ yelp_status () {
         yelp_usage_status
         exit 1
     fi
-    check_cache_file=`mktemp`
+    check_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
     yelp-build cache -o "$check_cache_file" "$@"
     xsltproc \
         --stringparam version "$check_version" \
@@ -588,9 +588,9 @@ yelp_validate_page () {
     # Using temp files because pipes create subshells, making it really
     # hard to return the right exit status in a portable way.
     if [ "x$check_rng_dir" = "x" ]; then
-        check_rng_dir=`mktemp -d`
+        check_rng_dir=`mktemp -d "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
     fi
-    check_out_file=`mktemp`
+    check_out_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX`
     check_rng_file=`(
             echo '<xsl:stylesheet'
             echo ' xmlns:cache="http://projectmallard.org/cache/1.0/";'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]