From ab4710f3738d386258f7e1e715bda7dad5d4504a Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Tue, 12 Dec 2017 02:55:54 +0000
Subject: [PATCH] lib/php/out.php

---
 bin/nb-update        | 6 +++---
 etc/profile.d/nb.sh  | 8 ++++++--
 etc/profile.d/sys.sh | 6 +++---
 lib/php/mime.php     | 1 +
 lib/php/out.php      | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/bin/nb-update b/bin/nb-update
index c91e8836..4fe2ef18 100755
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -87,8 +87,8 @@ for repo in $(nb_repos); do
   fi
 
   echo
-  nb_api_insert host_info key=repo.$name.exit_code val=$ex >/dev/null 2>&1
-  nb_api_insert host_info key=repo.$name.last_commit val=$(cd $NB_ROOT && git log | head -1 | awk '/^commit/ { print $2; exit; }') >/dev/null 2>&1
+  nb_api_insert host_info key=repo.$name.exit_code val=$ex
+  nb_api_insert host_info key=repo.$name.last_commit val=$(cd "$repo" && git log | head -1 | awk '/^commit/ { print $2; exit; }')
 
 done
 
@@ -99,7 +99,7 @@ rm -f /tmp/$NAME.infos
 find /tmp/$NAME.check -mmin +60 -exec rm {} \; > /dev/null 2>&1
 if [ ! -e /tmp/$NAME.check ]; then
   touch /tmp/$NAME.check
-  nb_api_insert_sys_infos >/dev/null 2>&1
+  nb_api_insert_sys_infos
 fi
 
 #####################################################################
diff --git a/etc/profile.d/nb.sh b/etc/profile.d/nb.sh
index 609a231d..fe1e442d 100644
--- a/etc/profile.d/nb.sh
+++ b/etc/profile.d/nb.sh
@@ -79,19 +79,23 @@ nb_api_insert() {
   local host=$(hostname)
   [ -z "$host" ] && host=$(hostname -f)
 
-  local curl="curl -su nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT -H 'Accept: text/json' https://api.nbdom.net/data/$table/insert -d host=$host"
+  local curl="curl -su nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT -H 'Accept: application/x-sh' https://api.nbdom.net/data/$table/insert -d host=$host"
 
   while [ "$#" -gt "0" ]; do
     curl="$curl -d \"$1\""
     shift
   done
-  eval "$curl | tr -d '\n'" && echo
+  (
+  eval "$curl"
+  ) #> /dev/null
 }
 
 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]}\""
     nb_api_insert host_info "key=${i[0]}" "val=${i[1]}"
   done
+) | sed 's/^/nb_api_insert_sys_infos: /'
 }
 
diff --git a/etc/profile.d/sys.sh b/etc/profile.d/sys.sh
index 5c3d114a..c24908be 100644
--- a/etc/profile.d/sys.sh
+++ b/etc/profile.d/sys.sh
@@ -7,9 +7,9 @@ sys_infos() {
 	local n='>/dev/null 2>&1'
 	local s=$'\t'
 	cat <<EOF
-arch${s}$( (sysctl -n hw.machine || arch) 2>/dev/null )
-nproc${s}$( (sysctl -n hw.ncpu || nproc || grep ^proc /proc/cpuinfo | wc -l) 2>/dev/null )
-date_install $( (date -r $(ls -1d /lost+found /etc/ssh/ssh_host_dsa_key.pub /etc/ssh_host_dsa_key.pub|head -1) +'%F %T') 2>/dev/null )
+arch${s}$( (arch || sysctl -n hw.machine) 2>/dev/null )
+nproc${s}$( (nproc || sysctl -n hw.ncpu || grep ^proc /proc/cpuinfo | wc -l) 2>/dev/null )
+date_install $( (date -r $(ls -1drt /lost+found /etc/ssh/ssh_host_dsa_key.pub /etc/ssh_host_dsa_key.pub|head -1) +'%F %T') 2>/dev/null )
 EOF
 }
 
diff --git a/lib/php/mime.php b/lib/php/mime.php
index 16a48c77..69de365e 100644
--- a/lib/php/mime.php
+++ b/lib/php/mime.php
@@ -689,6 +689,7 @@ class Mime {
     'text/json' => 'json',
     'text/x-php' => 'php',
 #<SHELL_REPLACE
+    'text/sh' => 'sh',
   ];
 
   public static function fromExt($ext) {
diff --git a/lib/php/out.php b/lib/php/out.php
index a9150c32..e93c4288 100644
--- a/lib/php/out.php
+++ b/lib/php/out.php
@@ -397,7 +397,7 @@ Class Out extends Nb {
         	$values[] = $v;
 				}
 
-    		echo join($o['sep'],$values) . $o['eol'];
+    		echo rtrim(join($o['sep'],$values)) . $o['eol'];
 			}
     	return;
     }
-- 
2.47.3