Merge branch 'master' of ssh://infra.opendoor.fr:2222/srv/git/repos/tom/eval_functions

localeval.sh

@@ -1,17 +1,18 @@
 #! /bin/bash
-set -euo pipefail
+set -eu
 IFS=$'\n\t'
 source functions.sh
-echo -ne "host\tname\troot history\tbash history\t<+CHANGEME+>\n"
-for host in /srv/lxc/ipi/ipi_g1*/rootfs ; do
-  root=${host}
-  #host=$(basename $host)
-  hostname=$(grep HOSTNAME ${root}/etc/sysconfig/network | cut -f2 -d=)
-  test -z  "${hostname}" && hostname=$(cat ${root}/etc/hostname)
-  test -f ${root}/etc/motd && user="$(cat ${root}/etc/motd | sed 's/\n//')\t"
-  echo -ne "${hostname}\t${user}"
-  fileMTime      ${root}/root/.bash_history
-  fileMTime      ${root}/home/formation/.bash_history
+echo -ne "host;name;root history;bash history;<+CHANGEME+>\n"
+for host in /srv/lxc/epsi/b2/* ; do
+	root=${host}/rootfs
+	host=$(basename $host)
+	hostname=$(grep HOSTNAME ${root}/etc/sysconfig/network 2>/dev/null| cut -f2 -d=)
+	test -z  "${hostname}" && hostname=$(cat ${root}/etc/hostname)
+	test -f ${root}/etc/motd && user="$(cat ${root}/etc/motd | xargs)"
+	test -z "$user" && continue
+	echo -ne "${hostname};${user};"
+	fileMTime      ${root}/root/.bash_history
+	fileMTime      ${root}/home/formation/.bash_history
 
   echo