changeset 178:1909bc3f539e draft

Merge branch 'master' of git://git1.somerandomnick.ano
author pragmo <pragmo@pragmo.ano>
date Mon, 11 Oct 2010 00:49:50 +0000
parents 70a066da663d (diff) 3d0a756413c6 (current diff)
children a7318a68e323
files
diffstat 1 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/nameserver_autogen/dnsmasq_tld_conffile	Mon Oct 11 00:21:05 2010 +0000
+++ b/scripts/nameserver_autogen/dnsmasq_tld_conffile	Mon Oct 11 00:49:50 2010 +0000
@@ -8,9 +8,12 @@
 
 sh scripts/check_db_safety || exit 1
 
-for a in $(ls db/ip/); do
-	for b in $(ls db/ip/${a}); do
-		for c in $(ls db/ip/${a}/${b}); do
+
+LS="ls --color=never"
+
+for a in $($LS db/ip/); do
+	for b in $($LS db/ip/${a}); do
+		for c in $($LS db/ip/${a}/${b}); do
 			if [ -d db/ip/${a}/${b}/${c}/ns/ ]; then
 			 	for ns in $(cat db/ip/${a}/${b}/${c}/ns/*); do
 					A1=$(scripts/hex2dec ${a})
@@ -26,8 +29,8 @@
 
 echo
 
-for tld in $(ls db/dom/); do 
-	for domain in $(ls db/dom/${tld}/); do 
+for tld in $($LS db/dom/); do 
+	for domain in $($LS db/dom/${tld}/); do 
 		for ns in $(cat db/dom/${tld}/${domain}/ns/*); do 
 			STR="server=/${domain}.${tld}/${ns}"
 			echo $STR