Author: eelco
Date: Wed Apr 4 21:02:06 2012
New Revision: 33590
URL: https://nixos.org/websvn/nix/?rev=33590&sc=1
Log:
* Revive generate-linear-patch-sequence.sh.
Modified:
release/trunk/patch/generate-linear-patch-sequence.sh
release/trunk/patch/generate-patches.sh
Modified: release/trunk/patch/generate-linear-patch-sequence.sh
==============================================================================
--- release/trunk/patch/generate-linear-patch-sequence.sh Wed Apr 4
20:50:43 2012 (r33589)
+++ release/trunk/patch/generate-linear-patch-sequence.sh Wed Apr 4
21:02:06 2012 (r33590)
@@ -1,28 +1,17 @@
#! /bin/sh -e
-if test -z "$HOME"; then exit 1; fi
+releasesDir=test
-LOCK=$HOME/generator-running
+prev=""
-if ! ln -s /lock $LOCK; then
- echo "already running, bailing out"
- exit 1
-fi
-
-cd /data/webserver/dist/nix
-
-last=""
-
-for i in $(ls -d nixpkgs-0.12pre* | sort -n); do
- if test -e "$i/MANIFEST"; then
- if test -n "$last" -a ! -e "$i/patches-created"; then
- echo $last "->" $i
+for i in $(cd "$releasesDir" && ls -d nixpkgs-*pre* | sort -n); do
+ if test -e "$releasesDir/$i/MANIFEST"; then
+ if test -n "$prev" -a ! -e "$releasesDir/$i/patches-created"; then
+ echo $prev "->" $i
date
- time $HOME/release/patch/generate-patches.sh "$last" "$i"
- touch "$i/patches-created"
+ time ./generate-patches.sh "$releasesDir/$prev" "$releasesDir/$i"
+ touch "$releasesDir/$i/patches-created"
fi
- last=$i
+ prev=$i
fi
done
-
-rm $LOCK
Modified: release/trunk/patch/generate-patches.sh
==============================================================================
--- release/trunk/patch/generate-patches.sh Wed Apr 4 20:50:43 2012
(r33589)
+++ release/trunk/patch/generate-patches.sh Wed Apr 4 21:02:06 2012
(r33590)
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/sh -e
src="$1"
dst="$2"
@@ -7,8 +7,8 @@
exit 1
fi
-$HOME/nix/scripts/generate-patches.pl \
- /data/webserver/dist/nix-cache \
- /data/webserver/dist/patches \
- http://nix.cs.uu.nl/dist/patches \
- "$src" "$dst"
+nix-generate-patches \
+ /data/releases/nars \
+ /data/releases/patches \
+ http://nixos.org/releases/patches \
+ "$src/MANIFEST" "$dst/MANIFEST"
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
