Continued:

[fba.git] / nodeinfo.sh

diff --git a/nodeinfo.sh b/nodeinfo.sh
index 3ec3862fc7da60881e5a3f29e36ddb27b2f0e79f..2ba294481e231ca6fe31c07c70c89837883072df 100755 (executable)
--- a/nodeinfo.sh
+++ b/nodeinfo.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MODE=""
-DOMAINS=""
+DOMAIN_LIST=""
 SOFTWARE_LIST=""
 
 if [ "$1" = "--help" ]
@@ -10,15 +10,15 @@ then
        exit 255
 elif [ -n "$1" -a -f "$1" ]
 then
-       DOMAINS=$(cat "$1")
+       DOMAIN_LIST=$(cat "$1")
        MODE="file"
 elif [ "$1" = "--nodeinfo" ]
 then
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE software IS NULL AND nodeinfo_url IS NOT NULL ORDER BY last_updated ASC;")
+       DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE software IS NULL AND nodeinfo_url IS NOT NULL ORDER BY last_updated ASC;")
        MODE="nodeinfo"
 elif [ "$1" = "--timeout" ]
 then
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE last_error_details LIKE '%Timeout%' ORDER BY last_updated ASC;")
+       DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE last_error_details LIKE '%Timeout%' ORDER BY last_updated ASC;")
        MODE="timeout"
 elif [ "$1" = "--software" -a -f "software.txt" ]
 then
@@ -26,25 +26,21 @@ then
        MODE="software"
 elif [ "$1" = "--generator" ]
 then
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE detection_mode='GENERATOR' ORDER BY last_updated ASC;")
+       DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE detection_mode='GENERATOR' ORDER BY last_updated ASC;")
        MODE="generator"
-elif [ "$1" = "--same" ]
-then
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE domain=software ORDER BY last_updated ASC;")
-       MODE="same"
 else
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE software IS NULL AND nodeinfo_url IS NOT NULL ORDER BY last_updated ASC;")
+       DOMAIN_LIST=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE software IS NULL AND nodeinfo_url IS NOT NULL ORDER BY last_updated ASC;")
 fi
 
-if [ -z "${DOMAINS}" -a -z "${SOFTWARE_LIST}" ]
+if [ -z "${DOMAIN_LIST}" -a -z "${SOFTWARE_LIST}" ]
 then
        echo "$0: No domains or software found! MODE='${MODE}'"
        exit 255
 fi
 
-if [ -n "${DOMAINS}" ]
+if [ -n "${DOMAIN_LIST}" ]
 then
-       for DOMAIN in ${DOMAINS};
+       for DOMAIN in ${DOMAIN_LIST};
        do
                echo "$0: DOMAIN='${DOMAIN}'"
                if [ -n "$1" -a -z "${MODE}" ]