diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-02-10T16·14+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-02-10T16·14+0000 |
| commit | 92e832348db13637875c4f529ed0aa83d3d34493 (patch) | |
| tree | c00a500e1be79bf061f8ebd17e694eb4f7ee8d55 /scripts | |
| parent | 6551b36790d47477087fc3a7f7bb779f28e42d8e (diff) | |
* Lots of manual stuff. Reference pages for most Nix commands.
* nix-pull now requires the full url to the manifest, i.e., `/MANIFEST/' is no longer automatically appended. * nix-prefetch-url works again.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/nix-prefetch-url.in | 2 | ||||
| -rw-r--r-- | scripts/nix-push.in | 2 | ||||
| -rw-r--r-- | scripts/readmanifest.pm.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/nix-prefetch-url.in b/scripts/nix-prefetch-url.in index 0509556821..71ba3caab9 100644 --- a/scripts/nix-prefetch-url.in +++ b/scripts/nix-prefetch-url.in @@ -25,7 +25,7 @@ rename $out, $out2; # Create a Nix expression. my $nixexpr = "(import @datadir@/nix/corepkgs/fetchurl) " . - "{url = $url; md5 = \"$hash\"; system = \"@system@\"}"; + "{url = $url; md5 = \"$hash\"; system = \"@system@\";}"; print "expr: $nixexpr\n"; diff --git a/scripts/nix-push.in b/scripts/nix-push.in index 1e1d905edc..b5899e4583 100644 --- a/scripts/nix-push.in +++ b/scripts/nix-push.in @@ -169,5 +169,5 @@ foreach my $nararchive (@nararchives) { # Upload the manifest. print STDERR "uploading manifest...\n"; system("$curl --show-error --upload-file " . - "'$manifest' '$manifest_put_url/' > /dev/null") == 0 or + "'$manifest' '$manifest_put_url' > /dev/null") == 0 or die "curl failed on $manifest: $?"; diff --git a/scripts/readmanifest.pm.in b/scripts/readmanifest.pm.in index 2c6223807d..08227a5d7e 100644 --- a/scripts/readmanifest.pm.in +++ b/scripts/readmanifest.pm.in @@ -11,7 +11,7 @@ sub processURL { print "obtaining list of Nix archives at $url...\n"; system("curl --fail --silent --show-error " . - "'$url/MANIFEST' > '$manifest' 2> /dev/null") == 0 + "'$url' > '$manifest' 2> /dev/null") == 0 or die "curl failed: $?"; open MANIFEST, "<$manifest"; |