diff options
| -rw-r--r-- | rules.ninja | 2 | ||||
| -rw-r--r-- | scripts/tree.rc | 4 | ||||
| -rwxr-xr-x | setup.rc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/rules.ninja b/rules.ninja index 5ec4c01a..a77e011f 100644 --- a/rules.ninja +++ b/rules.ninja @@ -25,7 +25,7 @@ rule cat command = cat $in >$out.tmp && mv $out.tmp $out rule yacc - command = oldpwd=$$PWD && cd $outdir && $yacc $yaccflags $$oldpwd/$in + command = oldcwd=$$PWD && cd $outdir && $yacc $yaccflags $$oldcwd/$in rule sed command = sed $expr >$out.tmp $in && mv $out.tmp $out diff --git a/scripts/tree.rc b/scripts/tree.rc index b641c922..28916224 100644 --- a/scripts/tree.rc +++ b/scripts/tree.rc @@ -11,10 +11,10 @@ fn checkstatus { status=() } -ifs=() { oldpwd=`{pwd | head -c -1} } +ifs=() { oldcwd=`{pwd | head -c -1} } cd $repo git read-tree --empty -git update-index --index-info <$oldpwd/$index +git update-index --index-info <$oldcwd/$index tree=`{git write-tree} ; checkstatus git update-ref refs/tags/$tag $tree @@ -45,14 +45,14 @@ fn gen { set outdir $outdir } - ifs=() { old_pwd=`{pwd | head -c -1} } + ifs=() { oldcwd=`{pwd | head -c -1} } . ./gen.rc build 'phony/$srcdir/gen' phony '$srcdir'/local.ninja $gen_inputs build '$srcdir'/local.ninja gen '|' setup.rc ninja.rc '$srcdir'/gen.rc if(! ~ $#tree_perms 0) { - printf '%s\n' $tree_perms >$old_pwd/local.perms + printf '%s\n' $tree_perms >$oldcwd/local.perms perms_inputs=( $perms_inputs '$srcdir'/local.perms ) } if(~ $#perms_inputs 0) build '$outdir/root.perms' stamp |