Ops:

[fba.git] / nodeinfo.sh

diff --git a/nodeinfo.sh b/nodeinfo.sh
index 53888d0dab0ed6fd49274b749c3393e330c80d72..16baaee4dfffe1d7a31eccb8f6318b9c5ea4c8f0 100755 (executable)
--- a/nodeinfo.sh
+++ b/nodeinfo.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
 
 MODE=""
+DOMAINS=""
+SOFTWARE_LIST=""
+
 if [ "$1" = "--help" ]
 then
-       echo "Usage: $0 [file|--software|--software2|--nodeinfo|--generator|--detection|--no-auto|--no-auto2|--timeout]"
+       echo "Usage: $0 [file|--software|--software2|--software3|--nodeinfo|--generator|--detection|--no-auto|--no-auto2|--timeout]"
        exit 255
 elif [ -n "$1" -a -f "$1" ]
 then
@@ -23,7 +26,7 @@ then
        MODE="detection"
 elif [ "$1" = "--no-auto" ]
 then
-       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE detection_mode != 'AUTO_DISCOVERY' ORDER BY last_updated ASC;")
+       DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE detection_mode IS NOT NULL AND detection_mode != 'AUTO_DISCOVERY' ORDER BY last_updated ASC;")
        MODE="noauto"
 elif [ "$1" = "--no-auto2" ]
 then
@@ -37,6 +40,10 @@ elif [ "$1" = "--software2" ]
 then
        DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE software IS NOT NULL AND detection_mode IS NULL ORDER BY last_updated ASC;")
        MODE="software2"
+elif [ "$1" = "--software3" -a -f "software.txt" ]
+then
+       SOFTWARE_LIST=$(cat software.txt)
+       MODE="software3"
 elif [ "$1" = "--generator" ]
 then
        DOMAINS=$(sqlite3 blocks.db "SELECT domain FROM instances WHERE detection_mode='GENERATOR' ORDER BY last_updated ASC;")
@@ -45,23 +52,39 @@ else
        DOMAINS=$(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}" ]
+if [ -z "${DOMAINS}" -a -z "${SOFTWARE_LIST}" ]
 then
-       echo "$0: No domains found! MODE='${MODE}'"
+       echo "$0: No domains or software found! MODE='${MODE}'"
        exit 255
 fi
 
-for DOMAIN in ${DOMAINS};
-do
-       echo "$0: DOMAIN='${DOMAIN}'"
-       if [ -n "$1" -a -z "${MODE}" ]
-       then
-               ./fba.py update_nodeinfo --domain=${DOMAIN} "$1"
-       elif [ -n "$2" ]
-       then
-               ./fba.py update_nodeinfo --domain=${DOMAIN} "$2"
-       else
-               ./fba.py update_nodeinfo --domain=${DOMAIN}
-       fi
-done
+if [ -n "${DOMAINS}" ]
+then
+       for DOMAIN in ${DOMAINS};
+       do
+               echo "$0: DOMAIN='${DOMAIN}'"
+               if [ -n "$1" -a -z "${MODE}" ]
+               then
+                       ./fba.py update_nodeinfo --domain=${DOMAIN} "$1"
+               elif [ -n "$2" ]
+               then
+                       ./fba.py update_nodeinfo --domain=${DOMAIN} "$2"
+               else
+                       ./fba.py update_nodeinfo --domain=${DOMAIN}
+               fi
+       done
+elif [ -n "${SOFTWARE_LIST}" ]
+then
+       for SOFTWARE in ${SOFTWARE_LIST};
+       do
+               echo "$0: SOFTWARE='${SOFTWARE}'"
+               if [ -n "$2" ]
+               then
+                       ./fba.py update_nodeinfo --software=${SOFTWARE} "$2"
+               else
+                       ./fba.py update_nodeinfo --software=${SOFTWARE}
+               fi
+       done
+fi
+
 echo "$0: All done."