Changeset 13

Timestamp:

11/07/05 16:32:17 (18 years ago)

Author:

kdeugau

Message:

/trunk

Checkpoint
Tweaked handling of location of temp dir; subbed $tmpdir and %{_tmpdir}

File:

• trunk/debbuild (modified) (7 diffs)

trunk/debbuild

@@ -47 +47 @@
         );
 my $topdir = "/usr/src/debian";
-my $buildroot = "/var/tmp/%{name}-%{version}-%{release}.root".int(rand(99998)+1);
+my $buildroot = "%{_tmppath}/%{name}-%{version}-%{release}.root".int(rand(99998)+1);
 
 # "Constants"
@@ -108 +108 @@
 
 die "Not enough arguments\n" if #$argv == 0;
+
+# Snag some environment data
+my $tmpdir;
+if (defined $ENV{TMP} && $ENV{TMP} =~ /^(\/var)?\/tmp$/) {
+  $tmpdir = $ENV{TMP};
+} else {
+  $tmpdir = "/var/tmp";
+}
 
 ##main
@@ -439 +447 @@
 
   # create script filename
-  my $prepscriptfile = "/var/tmp/deb-tmp.prep.".int(rand(99998)+1);
+  my $prepscriptfile = "$tmpdir/deb-tmp.prep.".int(rand(99998)+1);
   sysopen(PREPSCRIPT, $prepscriptfile, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW)
         or die $!;
@@ -464 +472 @@
 
   # create script filename
-  my $buildscriptfile = "/var/tmp/deb-tmp.build.".int(rand(99998)+1);
+  my $buildscriptfile = "$tmpdir/deb-tmp.build.".int(rand(99998)+1);
   sysopen(BUILDSCRIPT, $buildscriptfile, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW)
         or die $!;
@@ -490 +498 @@
 
   # create script filename
-  my $installscriptfile = "/var/tmp/deb-tmp.inst.".int(rand(99998)+1);
+  my $installscriptfile = "$tmpdir/deb-tmp.inst.".int(rand(99998)+1);
   sysopen(INSTSCRIPT, $installscriptfile, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW)
         or die $!;
@@ -520 +528 @@
 
   # create script filename
-  my $debscriptfile = "/var/tmp/deb-tmp.pkg.".int(rand(99998)+1);
+  my $debscriptfile = "$tmpdir/deb-tmp.pkg.".int(rand(99998)+1);
   sysopen(DEBSCRIPT, $debscriptfile, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW)
         or die $!;
@@ -658 +666 @@
   if ($section =~ /g/) {
     $macrostring =~ s/\%\{_topdir\}/$topdir/g;
-    $macrostring =~ s'%{_tmppath}'/var/tmp'g;
+    $macrostring =~ s|%{_tmppath}|$tmpdir|g;
     $macrostring =~ s'%{_docdir}'/usr/share/doc'g;
   } # done with globals section