Skip to content

Commit

Permalink
Use the new arguments from redo v0.10.
Browse files Browse the repository at this point in the history
(apenwarr: also updates to the matching, latest minimal/do)
  • Loading branch information
Jimmy Tang authored and apenwarr committed Jan 6, 2012
1 parent e2c6820 commit 6698992
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion default.8.do
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion do
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
10 changes: 5 additions & 5 deletions ui-macos/default.app.do
Original file line number Diff line number Diff line change
Expand Up @@ -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" .

Expand All @@ -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)
4 changes: 2 additions & 2 deletions ui-macos/default.app.tar.gz.do
Original file line number Diff line number Diff line change
@@ -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/
4 changes: 2 additions & 2 deletions ui-macos/default.app.zip.do
Original file line number Diff line number Diff line change
@@ -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/
4 changes: 2 additions & 2 deletions ui-macos/default.nib.do
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
redo-ifchange $1.xib
ibtool --compile $3 $1.xib
redo-ifchange $2.xib
ibtool --compile $3 $2.xib

0 comments on commit 6698992

Please sign in to comment.