From e3f280a3ca70b1e80edca168af75ff55ccbd2172 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Sat, 10 Jun 2006 16:14:38 +0000
Subject: [PATCH] Added explicit mktemp template names so that mktemp is more
compatible with other versions than Debian's. Also added Anarcat to the
AUTHORS file
---
AUTHORS | 3 ++-
ChangeLog | 2 ++
lib/easydialog.in | 10 +++++-----
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 8b615d1..d8a129d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,4 +15,5 @@ cmccallum@thecsl.org
Daniel.Bonniot@inria.fr
Brad Fritz <brad@fritzfam.com> -- trac patch
garcondumonde@riseup.net
-Martin Krafft madduck@debian.org -- admingroup patch
\ No newline at end of file
+Martin Krafft madduck@debian.org -- admingroup patch
+Anarcat
diff --git a/ChangeLog b/ChangeLog
index ac802d1..d7a166f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,8 @@ version 0.9.4 -- unreleased
vserver:
. init_vservers: fixed Debian bug #351083 (improper readlink syntax)
. found_vservers: escaped special grep repetition character +
+ . forced mktemp to use a template with a name to be more compatible with
+ different versions of mktemp, thanks anarcat
ninjahelper changes
. Recursively ignore subdirs in /etc/backup.d (Closes: #361102)
. Fix configdirectory error that forced you to use /etc/backup.d, thanks anarcat
diff --git a/lib/easydialog.in b/lib/easydialog.in
index d8033d4..d861218 100644
--- a/lib/easydialog.in
+++ b/lib/easydialog.in
@@ -48,7 +48,7 @@ gaugeBox() {
}
inputBox() {
- local temp=$(mktemp -t) || exit 1
+ local temp=$(mktemp -t backupninja.XXXXXX) || exit 1
trap "rm -f $temp" 0
REPLY=
$DIALOG --backtitle "$BACKTITLE" --title "$1" \
@@ -80,7 +80,7 @@ _genericListBox() {
local title=$1
local text=$2
shift 2
- local temp=$(mktemp -t) || exit 1
+ local temp=$(mktemp -t backupninja.XXXXXX) || exit 1
trap "rm -f $temp" 0
REPLY=
$DIALOG $HELP $_DEFAULT --backtitle "$BACKTITLE" --title "$title" \
@@ -133,7 +133,7 @@ textBox() {
}
passwordBox() {
- local temp=$(mktemp -t) || exit 1
+ local temp=$(mktemp -t backupninja.XXXXXX) || exit 1
trap "rm -f $temp" 0
REPLY=
$DIALOG --backtitle "$BACKTITLE" --title "$1" \
@@ -175,7 +175,7 @@ listItem() {
##
listDisplay() {
boxtype=$1
- local temp=$(mktemp -t) || exit 1
+ local temp=$(mktemp -t backupninja.XXXXXX) || exit 1
trap "rm -f $temp" 0
local label
@@ -221,7 +221,7 @@ formItem() {
}
formDisplay() {
- local temp=$(mktemp -t) || exit 1
+ local temp=$(mktemp -t backupninja.XXXXXX) || exit 1
max_length=0
for ((i=0; i < ${#_form_labels[@]} ; i++)); do
--
GitLab