diff options
Diffstat (limited to 'scripts/nix-install-package.in')
| -rw-r--r-- | scripts/nix-install-package.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/nix-install-package.in b/scripts/nix-install-package.in index 4f5b0087fee3..35f6d6824838 100644 --- a/scripts/nix-install-package.in +++ b/scripts/nix-install-package.in @@ -68,7 +68,7 @@ if ($interactive && !defined $ENV{"NIX_HAVE_TERMINAL"}) { my $tmpDir; do { $tmpDir = tmpnam(); } until mkdir $tmpDir, 0777; -END { if (defined $tmpDir) { my $x = $?; system ("@coreutils@/rm", "-rf", $tmpDir); $? = $x; } } +END { if (defined $tmpDir) { my $x = $?; system("@coreutils@/rm", "-rf", $tmpDir); $? = $x; } } sub barf { @@ -83,7 +83,7 @@ sub barf { my $pkgFile = $source; if ($fromURL) { $pkgFile = "$tmpDir/tmp.nixpkg"; - system ("@curl@", "--silent", $source, "-o", $pkgFile) == 0 + system("@curl@", "--silent", $source, "-o", $pkgFile) == 0 or barf "curl failed: $?"; } @@ -124,12 +124,12 @@ if ($interactive) { print "\nPulling manifests...\n"; -system ("@bindir@/nix-pull", $manifestURL) == 0 +system("@bindir@/nix-pull", $manifestURL) == 0 or barf "nix-pull failed: $?"; print "\nInstalling package...\n"; -system ("@bindir@/nix-env", "--install", $outPath, @extraNixEnvArgs) == 0 +system("@bindir@/nix-env", "--install", $outPath, @extraNixEnvArgs) == 0 or barf "nix-env failed: $?"; |