[PATCH] archimport - better handling of temp dirs

Switched from backwards hard-coded tmp directory creation to using
File::Temp::tempdir() to create the directory inside $TMP_PATH or
what the user has provided via the -t parameter.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-archimport.perl b/git-archimport.perl
index 518a0ea9141ecd9976c29ccbaf1130e7e9946fd1..3749b8b5728f7bdb0f6adb317b25ecfa81902042 100755 (executable)
--- a/git-archimport.perl
+++ b/git-archimport.perl
@@ -23,7 +23,6 @@ =head1 TODO
 
  - create tag objects instead of ref tags
  - audit shell-escaping of filenames
 
  - create tag objects instead of ref tags
  - audit shell-escaping of filenames

- - better handling of temp directories

  - hide our private tags somewhere smarter
  - find a way to make "cat *patches | patch" safe even when patchfiles are missing newlines  
 
  - hide our private tags somewhere smarter
  - find a way to make "cat *patches | patch" safe even when patchfiles are missing newlines  
 


@@ -37,7 +36,7 @@ =head1 Devel tricks
 use warnings;
 use Getopt::Std;
 use File::Spec;
 use warnings;
 use Getopt::Std;
 use File::Spec;

-use File::Temp qw(tempfile);
+use File::Temp qw(tempfile tempdir);

 use File::Path qw(mkpath);
 use File::Basename qw(basename dirname);
 use String::ShellQuote;
 use File::Path qw(mkpath);
 use File::Basename qw(basename dirname);
 use String::ShellQuote;


@@ -72,9 +71,10 @@ END
 @ARGV >= 1 or usage();
 my @arch_roots = @ARGV;
 
 @ARGV >= 1 or usage();
 my @arch_roots = @ARGV;
 

-my $tmp = $opt_t;
-$tmp ||= '/tmp';
-$tmp .= '/git-archimport/';
+my ($tmpdir, $tmpdirname) = tempdir('git-archimport-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $tmp = $opt_t || 1;
+$tmp = tempdir('git-archimport-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+$opt_v && print "+ Using $tmp as temporary directory\n";

 
 my @psets  = ();                # the collection
 my %psets  = ();                # the collection, by name
 
 my @psets  = ();                # the collection
 my %psets  = ();                # the collection, by name