Use the new arguments from redo v0.10.

(apenwarr: also updates to the matching, latest minimal/do)

6 files changed, 13 insertions, 13 deletions

diff --git a/default.8.do b/default.8.do
index 6d8dc8c..467bfbe 100644
--- a/default.8.do
+++ b/default.8.do
@@ -1,6 +1,6 @@
 exec >&2
 if pandoc </dev/null 2>/dev/null; then
-	pandoc -s -r markdown -w man -o $3 $1.md
+	pandoc -s -r markdown -w man -o $3 $2.md
 else
 	echo "Warning: pandoc not installed; can't generate manpages."
 	redo-always
diff --git a/do b/do
index f08e002..d84c442 100755
--- a/do
+++ b/do
@@ -121,7 +121,7 @@ _do()
 		fi
 		[ ! -e "$DO_BUILT" ] || [ ! -d "$(dirname "$target")" ] ||
 		: >>"$target.did"
-		( _run_dofile "$base" "$ext" "$tmp.tmp" )
+		( _run_dofile "$target" "$base" "$tmp.tmp" )
 		rv=$?
 		if [ $rv != 0 ]; then
 			printf "do: %s%s\n" "$DO_DEPTH" \
diff --git a/ui-macos/default.app.do b/ui-macos/default.app.do
index 64e3a52..5c88273 100644
--- a/ui-macos/default.app.do
+++ b/ui-macos/default.app.do
@@ -3,9 +3,9 @@ redo-ifchange sources.list
 redo-ifchange Info.plist bits/runpython \
 	$(while read name newname; do echo "$name"; done <sources.list)
 
-rm -rf "$1.app"
-mkdir "$1.app" "$1.app/Contents"
-cd "$1.app/Contents"
+rm -rf "$2.app"
+mkdir "$2.app" "$2.app/Contents"
+cd "$2.app/Contents"
 
 cp "$TOP/Info.plist" .
 
@@ -18,11 +18,11 @@ cd "$TOP"
 while read name newname; do
 	[ -z "$name" ] && continue
 	: "${newname:=$name}"
-	outname=$1.app/Contents/Resources/$newname
+	outname=$2.app/Contents/Resources/$newname
 	outdir=$(dirname "$outname")
 	[ -d "$outdir" ] || mkdir "$outdir"
 	cp "${name-$newname}" "$outname"
 done <sources.list
 
-cd "$1.app"
+cd "$2.app"
 redo-ifchange $(find . -type f)
diff --git a/ui-macos/default.app.tar.gz.do b/ui-macos/default.app.tar.gz.do
index 3311d31..5d9336e 100644
--- a/ui-macos/default.app.tar.gz.do
+++ b/ui-macos/default.app.tar.gz.do
@@ -1,5 +1,5 @@
 exec >&2
 IFS="
 "
-redo-ifchange $1.app
-tar -czf $3 $1.app/
+redo-ifchange $2.app
+tar -czf $3 $2.app/
diff --git a/ui-macos/default.app.zip.do b/ui-macos/default.app.zip.do
index c12e2d2..64f3a10 100644
--- a/ui-macos/default.app.zip.do
+++ b/ui-macos/default.app.zip.do
@@ -1,5 +1,5 @@
 exec >&2
 IFS="
 "
-redo-ifchange $1.app
-zip -q -r $3 $1.app/
+redo-ifchange $2.app
+zip -q -r $3 $2.app/
diff --git a/ui-macos/default.nib.do b/ui-macos/default.nib.do
index afa91f4..02ddec6 100644
--- a/ui-macos/default.nib.do
+++ b/ui-macos/default.nib.do
@@ -1,2 +1,2 @@
-redo-ifchange $1.xib
-ibtool --compile $3 $1.xib
+redo-ifchange $2.xib
+ibtool --compile $3 $2.xib