summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-26 13:48:23 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-26 13:48:23 +0100
commitbf4a577a586d99b7bc4298ae662e312eb73815e2 (patch)
tree635bd6806fd33dcd5c3c40d5ac88a885b5fa35c8 /scripts
parent8a02fdc38ef5d02115d152a2d3e79ebd8a462e3e (diff)
downloadguix-bf4a577a586d99b7bc4298ae662e312eb73815e2.tar.gz
Fix broken patch
Diffstat (limited to 'scripts')
-rw-r--r--scripts/download-from-binary-cache.pl.in2
-rwxr-xr-xscripts/nix-channel.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/download-from-binary-cache.pl.in b/scripts/download-from-binary-cache.pl.in
index babf6cd28f..63abfb9179 100644
--- a/scripts/download-from-binary-cache.pl.in
+++ b/scripts/download-from-binary-cache.pl.in
@@ -40,7 +40,7 @@ my %requests;
 my %scheduled;
 my $caBundle = $ENV{"CURL_CA_BUNDLE"} // $ENV{"OPENSSL_X509_CERT_FILE"};
 
-my $userName = getpwuid($<) or $ENV{"USER"} or die "cannot figure out user name";
+my $userName = getpwuid($<) || $ENV{"USER"} or die "cannot figure out user name";
 
 my $requireSignedBinaryCaches = ($Nix::Config::config{"signed-binary-caches"} // "0") ne "0";
 
diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in
index db1ca29937..62292a87fd 100755
--- a/scripts/nix-channel.in
+++ b/scripts/nix-channel.in
@@ -22,7 +22,7 @@ my $channelsList = "$home/.nix-channels";
 my $nixDefExpr = "$home/.nix-defexpr";
 
 # Figure out the name of the channels profile.
-my $userName = getpwuid($<) or $ENV{"USER"} or die "cannot figure out user name");
+my $userName = getpwuid($<) || $ENV{"USER"} or die "cannot figure out user name";
 my $profile = "$Nix::Config::stateDir/profiles/per-user/$userName/channels";
 mkpath(dirname $profile, 0, 0755);