lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* nix-push / generate-patches: bzip the manifest.

Browse source
This commit is contained in:
Eelco Dolstra 2007-09-04 15:38:09 +00:00
parent 7b20c0ed4b
commit 9441550acb
5 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/nix-push.in
View file

@ -264,8 +264,12 @@ foreach my $narArchive (@narArchives) {
print STDERR "uploading manifest...\n"; print STDERR "uploading manifest...\n";
if ($localCopy) { if ($localCopy) {
copyFile $manifest, $localManifestFile; copyFile $manifest, $localManifestFile;
copyFile "$manifest.bz2", "$localManifestFile.bz2";
} else { } else {
system("$curl --show-error --upload-file " . system("$curl --show-error --upload-file " .
"'$manifest' '$manifestPutURL' > /dev/null") == 0 or "'$manifest' '$manifestPutURL' > /dev/null") == 0 or
die "curl failed on $manifest: $?"; die "curl failed on $manifest: $?";
system("$curl --show-error --upload-file " .
"'$manifest'.bz2 '$manifestPutURL'.bz2 > /dev/null") == 0 or
die "curl failed on $manifest: $?";
} }

8
scripts/readmanifest.pm.in
View file

@ -222,6 +222,14 @@ sub writeManifest
rename("$manifest.tmp", $manifest) rename("$manifest.tmp", $manifest)
or die "cannot rename $manifest.tmp: $!"; or die "cannot rename $manifest.tmp: $!";
# Create a bzipped manifest.
system("@bzip2@ < $manifest > $manifest.bz2.tmp") == 0
or die "cannot compress manifest";
rename("$manifest.bz2.tmp", "$manifest.bz2")
or die "cannot rename $manifest.bz2.tmp: $!";
} }

3
tests/init.sh
View file

@ -27,6 +27,7 @@ ln -s $TOP/scripts/nix-prefetch-url $NIX_BIN_DIR/
ln -s $TOP/scripts/nix-collect-garbage $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-collect-garbage $NIX_BIN_DIR/
ln -s $TOP/scripts/nix-build $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-build $NIX_BIN_DIR/
ln -s $TOP/scripts/nix-install-package $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-install-package $NIX_BIN_DIR/
ln -s $TOP/scripts/nix-push $NIX_BIN_DIR/
ln -s $TOP/scripts/nix-pull $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-pull $NIX_BIN_DIR/
ln -s $bzip2_bin_test/bzip2 $NIX_BIN_DIR/ ln -s $bzip2_bin_test/bzip2 $NIX_BIN_DIR/
ln -s $bzip2_bin_test/bunzip2 $NIX_BIN_DIR/ ln -s $bzip2_bin_test/bunzip2 $NIX_BIN_DIR/
@ -57,7 +58,9 @@ for i in \
$NIX_BIN_DIR/nix-collect-garbage \ $NIX_BIN_DIR/nix-collect-garbage \
$NIX_BIN_DIR/nix-build \ $NIX_BIN_DIR/nix-build \
$NIX_BIN_DIR/nix-install-package \ $NIX_BIN_DIR/nix-install-package \
$NIX_BIN_DIR/nix-push \
$NIX_BIN_DIR/nix-pull \ $NIX_BIN_DIR/nix-pull \
$NIX_BIN_DIR/nix/readmanifest.pm \
; do ; do
sed < $i > $i.tmp \ sed < $i > $i.tmp \
-e "s^$REAL_BIN_DIR^$NIX_BIN_DIR^" \ -e "s^$REAL_BIN_DIR^$NIX_BIN_DIR^" \

2
tests/nix-pull.sh
View file

@ -2,7 +2,7 @@ source common.sh
pullCache () { pullCache () {
echo "pulling cache..." echo "pulling cache..."
$PERL -w -I$TOP/scripts $TOP/scripts/nix-pull file://$TEST_ROOT/manifest $NIX_BIN_DIR/nix-pull file://$TEST_ROOT/manifest
} }
clearStore clearStore

2
tests/nix-push.sh
View file

@ -7,5 +7,5 @@ echo "pushing $drvPath"
mkdir $TEST_ROOT/cache mkdir $TEST_ROOT/cache
$PERL -w -I$TOP/scripts $TOP/scripts/nix-push \ $NIX_BIN_DIR/nix-push \
--copy $TEST_ROOT/cache $TEST_ROOT/manifest $drvPath --copy $TEST_ROOT/cache $TEST_ROOT/manifest $drvPath