From c3981d81f65eda945f7a48d10ce7600fc0419f58 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Feb 2005 17:50:48 +0000 Subject: * Make check fixes. --- scripts/nix-pull.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in index ee90a06e27e7..8bc560ba5f5f 100644 --- a/scripts/nix-pull.in +++ b/scripts/nix-pull.in @@ -19,8 +19,8 @@ $binDir = "@bindir@" unless defined $binDir; my $libexecDir = $ENV{"NIX_LIBEXEC_DIR"}; $libexecDir = "@libexecdir@" unless defined $libexecDir; -my $localStateDir = $ENV{"NIX_LOCALSTATE_DIR"}; -$localStateDir = "@localstatedir@" unless defined $localStateDir; +my $stateDir = $ENV{"NIX_STATE_DIR"}; +$stateDir = "@localstatedir@/nix" unless defined $stateDir; # Obtain URLs either from the command line or from a configuration file. @@ -49,7 +49,7 @@ sub processURL { or die "cannot hash `$manifest'"; chomp $hash; - my $finalPath = "$localStateDir/nix/manifests/$baseName-$hash.nixmanifest"; + my $finalPath = "$stateDir/manifests/$baseName-$hash.nixmanifest"; system("mv '$manifest' '$finalPath'") == 0 or die "cannot move `$manifest' to `$finalPath"; -- cgit 1.4.1