Merge branch 'develop'

txthinking · Apr 1, 2015 · 6ae4b55 · 6ae4b55
2 parents 4d8e5f0 + 866d138
commit 6ae4b55
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 3 deletions.
diff --git a/scripts/d2ip_arm b/scripts/d2ip_arm
diff --git a/scripts/d2ip_i386 b/scripts/d2ip_i386
diff --git a/scripts/d2ip_64 → scripts/d2ip_x86_64 b/scripts/d2ip_64 → scripts/d2ip_x86_64
diff --git a/scripts/find.sh b/scripts/find.sh
@@ -20,8 +20,8 @@ then
     mkdir output
 fi
 
-first=$(./iprange_64 $1 | awk '{print $1}')
-last=$(./iprange_64 $1 | awk '{print $2}')
+first=$(./iprange_$(uname -m) $1 | awk '{print $1}')
+last=$(./iprange_$(uname -m) $1 | awk '{print $2}')
 output=output/$first-$last
 > $output
 
@@ -41,7 +41,7 @@ do
     {
         read -u9
         {
-            ip=$(./d2ip_64 $i)
+            ip=$(./d2ip_$(uname -m) $i)
             out=$(./getssl.sh $ip)
             echo -e "$out"
             echo -e "$out" >> $output

diff --git a/scripts/iprange_arm b/scripts/iprange_arm
diff --git a/scripts/iprange_i386 b/scripts/iprange_i386
diff --git a/scripts/iprange_64 → scripts/iprange_x86_64 b/scripts/iprange_64 → scripts/iprange_x86_64