fetch-curl: Support specifying a pattern of files to extract

3 files changed, 17 insertions, 5 deletions

diff --git a/ninja.rc b/ninja.rc
index 8b618054..d8815072 100644
--- a/ninja.rc
+++ b/ninja.rc
@@ -160,6 +160,11 @@ fn fetch {
 		# Use a phony rule and stamp file to prevent ninja from making
 		# parent directories.
 		build '$outdir'/fetch.stamp fetch$1 '|' '$dir'/.rev
+		shift
+		if(! ~ $#* 0) {
+			*=''''$*''''
+			with args $"*
+		}
 		build $"allsrcs phony '$outdir'/fetch.stamp
 	}
 	status=()
diff --git a/rules.ninja b/rules.ninja
index c90f087a..ebb8a983 100644
--- a/rules.ninja
+++ b/rules.ninja
@@ -62,13 +62,13 @@ rule gitinit
   command = mkdir -p $builddir/$repo.git && git -C $builddir/$repo.git init --bare && touch $out
 
 rule fetchcurl
-  command = rc ./scripts/fetch-curl.rc $dir && touch $out
+  command = rc ./scripts/fetch-curl.rc $dir $args && touch $out
   restat = 1
   generator = 1
   pool = console
 
 rule fetchgit
-  command = rc ./scripts/fetch-git.rc $dir && touch $out
+  command = rc ./scripts/fetch-git.rc $dir $args && touch $out
   restat = 1
   generator = 1
   pool = console
diff --git a/scripts/fetch-curl.rc b/scripts/fetch-curl.rc
index 09ba2157..9f811837 100755
--- a/scripts/fetch-curl.rc
+++ b/scripts/fetch-curl.rc
@@ -2,12 +2,13 @@
 
 flag e +
 
-if(! ~ $#* 1) {
-	echo 'usage: fetch-curl.rc dir' >[1=2]
+if(~ $#* 0) {
+	echo 'usage: fetch-curl.rc dir pattern...' >[1=2]
 	exit 2
 }
 
 cd $1
+shift
 
 if([ -e src ]) rm -rf src
 
@@ -27,7 +28,13 @@ for(archive in `{awk '{print $2}' sha256}) {
 	case *
 		tool=()
 	}
-	if(! ~ $#tool 0) $tool $archive | pax -r -s '/^\.\|[^\/]*/src/'
+	pats=()
+	while(! ~ $1 '' ';') {
+		pats=($pats $1)
+		shift
+	}
+	shift
+	if(! ~ $#tool 0) $tool $archive | pax -r -s '/^\.\|[^\/]*/src/' $pats
 }
 
 if([ -d patch ]) {