summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-06-27 21:27:01 -0700
committerMichael Forney <mforney@mforney.org>2016-06-27 21:27:01 -0700
commit88ce95f6fc5385f6cfaebe8687c5c2e33654a716 (patch)
treefb3ab7d99e5318e6d1cb44691fde205abdbf7efc
parentb8d6bb110918de6d0ddeb69c546e27eb379de944 (diff)
Set ifs to newline by default
-rw-r--r--core/tz/gen.rc7
-rw-r--r--ninja.rc2
-rwxr-xr-xsetup.rc2
3 files changed, 5 insertions, 6 deletions
diff --git a/core/tz/gen.rc b/core/tz/gen.rc
index b5ebefe6..d45395cb 100644
--- a/core/tz/gen.rc
+++ b/core/tz/gen.rc
@@ -26,13 +26,12 @@ for(data in $tzdata) {
build $"outs zic '$srcdir'/$data
for(zone in $zones) file share/zoneinfo/$zone '$outdir'/zoneinfo/$zone 644
}
- ifs='
-' { links=`{awk '/^Link/ {print $2 " " $3}' $data} }
+ links=`{awk '/^Link/ {print $2 " " $3}' $data}
for(line in $links) {
# TODO: Figure out how to do this better. Maybe just readlink
# the symlinks constructed by zic?
- link=`{printf %s $line}
- ifs=/ { parts=`{printf %s $link(1)} }
+ ifs=' ' {link=`{printf %s $line}}
+ ifs='/' {parts=`{printf %s $link(1)}}
target=`{awk 'BEGIN {for(i=1; i<'$#parts'; i++) printf "../"}'}^$link(1)
sym share/zoneinfo/$link(2) $target
}
diff --git a/ninja.rc b/ninja.rc
index af3a0feb..8cdcda5a 100644
--- a/ninja.rc
+++ b/ninja.rc
@@ -155,7 +155,7 @@ fn sym {
}
fn fetch {
- ifs=$nl {allsrcs=`{printf %s\n $allsrcs | sort -u}}
+ allsrcs=`{printf %s\n $allsrcs | sort -u}
build $"allsrcs fetch$1 '|' '$dir'/.rev
}
diff --git a/setup.rc b/setup.rc
index 1c085caa..7f99f817 100755
--- a/setup.rc
+++ b/setup.rc
@@ -11,7 +11,7 @@ fn usage {
if(! ~ $#* 0 1) usage
-nl='
+ifs='
'
. ./ninja.rc