bin/nb-update

diff --git a/bin/nb-update b/bin/nb-update
index 109b0a2e32c5535982acce84e89cc29187fdd3db..50e90359b1f17414872c6a38b6c2f015d9a270bb 100755 (executable)
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -87,7 +87,7 @@ for repo in $(nb_repos); do
   fi
 
   echo
-  nb_api_insert host_info $NAME.$name $([ "$ex" = "0" ] && echo ok || echo "err=$ex" ) 1>/dev/null 2>&1
+  nb_api_insert host_info key=$NAME.$name val=$([ "$ex" = "0" ] && echo ok || echo "err=$ex" ) >/dev/null 2>&1
 
 done
 
@@ -104,7 +104,6 @@ fi
 find /tmp/$NAME.infos -mmin +60 > /dev/null 2>&1
 if [ ! -e /tmp/$NAME.infos ]; then
   touch /tmp/$NAME.infos
-  nb_api_insert host_info >/dev/null 2>&1 arch $(sysctl -n hw.machine || arch)
-  nb_api_insert host_info >/dev/null 2>&1 nproc $(sysctl -n hw.ncpu || nproc || grep ^proc /proc/cpuinfo |wc -)
+  nb_api_insert_sys_infos >/dev/null 2>&1
 fi
 exit $ex

diff --git a/etc/profile.d/nb.sh b/etc/profile.d/nb.sh
index c1e5883bc0997f43f1702d0c78dbf59e24cfa0ad..609a231d29f1851fa12948ec9a5dec776546bc3e 100644 (file)
--- a/etc/profile.d/nb.sh
+++ b/etc/profile.d/nb.sh
@@ -82,7 +82,7 @@ nb_api_insert() {
   local curl="curl -su nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT -H 'Accept: text/json' https://api.nbdom.net/data/$table/insert -d host=$host"
 
   while [ "$#" -gt "0" ]; do
-    curl+=" -d "$1""
+    curl="$curl -d \"$1\""
     shift
   done
   eval "$curl | tr -d '\n'" && echo
@@ -90,7 +90,8 @@ nb_api_insert() {
 
 nb_api_insert_sys_infos() {
   sys_infos | while IFS=$'\t' read -r -a i; do
-    eval "nb_api_insert host_info \"key=${i[0]}\" \"val=${i[1]}\""
+    #eval "nb_api_insert host_info \"key=${i[0]}\" \"val=${i[1]}\""
+    nb_api_insert host_info "key=${i[0]}" "val=${i[1]}"
   done
 }