diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-07-10T20·34+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-07-10T20·34+0000 |
| commit | 822c072cfa0f1e4ac304343d78e024ba19da34a8 (patch) | |
| tree | a47172b7a6c22b9b6d2655eca272f8a5eca1eb3b /scripts | |
| parent | 9bcc31c94168717c8bd27b83bfab686264f63745 (diff) | |
* Compress Nix archives when pushing them.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/nix-pull | 2 | ||||
| -rw-r--r-- | scripts/nix-push | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/nix-pull b/scripts/nix-pull index 6404cb79a17a..320322585364 100644 --- a/scripts/nix-pull +++ b/scripts/nix-pull @@ -31,7 +31,7 @@ while (<CONFFILE>) { my $fn = $1; next if $fn =~ /\.\./; next if $fn =~ /\//; - next unless $fn =~ /-([0-9a-z]{32})(-s-([0-9a-z]{32}))?\.nar/; + next unless $fn =~ /-([0-9a-z]{32})(-s-([0-9a-z]{32}))?\.nar.bz2$/; my $hash = $1; my $fshash = $3; diff --git a/scripts/nix-push b/scripts/nix-push index 248a3b9174d6..bf30f3a49d7f 100644 --- a/scripts/nix-push +++ b/scripts/nix-push @@ -33,7 +33,7 @@ foreach my $hash (@ARGV) { if ($path =~ /-s-([0-9a-z]{32}).nix$/) { $name = "$name-s-$1"; } - $name = $name . ".nar"; + $name = $name . ".nar.bz2"; # Construct a Fix expression that creates a Nix archive. my $fixexpr = @@ -65,4 +65,6 @@ foreach my $hash (@ARGV) { } # Push the prebuilts to the server. !!! FIXME -system "rsync -av -e ssh @pushlist eelco\@losser.st-lab.cs.uu.nl:/home/eelco/public_html/nix-dist/"; +if (scalar @pushlist > 0) { + system "rsync -av -e ssh @pushlist eelco\@losser.st-lab.cs.uu.nl:/home/eelco/public_html/nix-dist/"; +} |