mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Use paths, not strings, when calling the function that generates

Browse source 
NARs.  Fixes the impurity of nix-push (NIX-21).
* Better help.
This commit is contained in:
Eelco Dolstra 2006-09-20 15:04:04 +00:00
parent 7dd342e482
commit a060adf165
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
scripts/nix-push.in
View file

@ -37,8 +37,22 @@ my $archivesPutURL;
my $archivesGetURL; my $archivesGetURL;
my $manifestPutURL; my $manifestPutURL;
sub showSyntax {
print STDERR <<EOF
Usage: nix-push --copy ARCHIVES_DIR MANIFEST_FILE PATHS...
or: nix-push ARCHIVES_PUT_URL ARCHIVES_GET_URL MANIFEST_PUT_URL PATHS...
`nix-push' copies or uploads the closure of PATHS to the given
destination.
EOF
; # `
exit 1;
}
showSyntax if scalar @ARGV < 1;
if ($ARGV[0] eq "--copy") { if ($ARGV[0] eq "--copy") {
die "syntax: nix-push --copy ARCHIVES_DIR MANIFEST_FILE PATHS...\n" if scalar @ARGV < 3; showSyntax if scalar @ARGV < 3;
$localCopy = 1; $localCopy = 1;
shift @ARGV; shift @ARGV;
$localArchivesDir = shift @ARGV; $localArchivesDir = shift @ARGV;
@ -52,8 +66,7 @@ if ($ARGV[0] eq "--copy") {
} }
} }
else { else {
die "syntax: nix-push ARCHIVES_PUT_URL ARCHIVES_GET_URL " . showSyntax if scalar @ARGV < 3;
"MANIFEST_PUT_URL PATHS...\n" if scalar @ARGV < 3;
$localCopy = 0; $localCopy = 0;
$archivesPutURL = shift @ARGV; $archivesPutURL = shift @ARGV;
$archivesGetURL = shift @ARGV; $archivesGetURL = shift @ARGV;
@ -95,15 +108,9 @@ foreach my $storePath (@storePaths) {
die unless ($storePath =~ /\/[0-9a-z]{32}.*$/); die unless ($storePath =~ /\/[0-9a-z]{32}.*$/);
# Construct a Nix expression that creates a Nix archive. # Construct a Nix expression that creates a Nix archive.
# !!! the string reference to `$storePath' is impure! We could
# also pass it as a normal input, but that would cause it to be
# copied, and its name would be expanded (e.g.,
# /nix/store/HASH1-HASH2-symname). nix-instantiate should be
# smart enough to add store paths as direct references of the Nix
# expression.
my $nixexpr = my $nixexpr =
"((import $dataDir/nix/corepkgs/nar/nar.nix) " . "((import $dataDir/nix/corepkgs/nar/nar.nix) " .
"{storePath = \"$storePath\"; system = \"@system@\"; hashAlgo = \"$hashAlgo\";}) "; "{storePath = $storePath; system = \"@system@\"; hashAlgo = \"$hashAlgo\";}) ";
print NIX $nixexpr; print NIX $nixexpr;
} }