diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-26T12·48+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-26T12·48+0100 |
commit | bf4a577a586d99b7bc4298ae662e312eb73815e2 (patch) | |
tree | 635bd6806fd33dcd5c3c40d5ac88a885b5fa35c8 | |
parent | 8a02fdc38ef5d02115d152a2d3e79ebd8a462e3e (diff) |
Fix broken patch
-rw-r--r-- | scripts/download-from-binary-cache.pl.in | 2 | ||||
-rwxr-xr-x | scripts/nix-channel.in | 2 |
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 babf6cd28f5f..63abfb9179ba 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 db1ca2993777..62292a87fd73 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); |