From d7120cf16b3303c6ddda80fa70a6a075a50c2bbc Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Tue, 9 Jan 2018 05:29:34 +0000
Subject: [PATCH] share/db/update.sh

---
 etc/vim/source/vars.vim   |  5 ++++-
 share/db/shell_replace.sh | 13 +++++++++++++
 share/db/update.sh        | 12 +-----------
 3 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 share/db/shell_replace.sh

diff --git a/etc/vim/source/vars.vim b/etc/vim/source/vars.vim
index eb55ddd8..bfc7020e 100644
--- a/etc/vim/source/vars.vim
+++ b/etc/vim/source/vars.vim
@@ -4,12 +4,14 @@
 " Command to check files per file types
 "
 " rows.fields=id,cmd_check
-">SHELL_REPLACE echo "let mimeCheck = {"; dbq db=$NB_DB t=mime -cut 1,3 | sort -k 1 | sed -E -e "s/'/''/g" -e "s/^(.*?)\t(.*)$/  \\\,'\1' : '\2'/" -e "0,/,/s/,//" ; echo "\}"
+">SHELL_REPLACE echo "let mimeCheck = {"; dbq db=$NB_DB t=mime rows.fields=id,cmd_check | sort -k 1 | sed -E -e "s/'/''/g" -e "s/^(.*?)\t(.*)$/  \\\,'\1' : '\2'/" -e "0,/,/s/,//" ; echo "\}"
 let mimeCheck = {
   \'bash' : 'bash -c'
   \,'erb' : 'sh -c \"cat | erb -x - | ruby -c\" <'
+  \,'haproxy.cfg' : 'haproxy -c -f'
   \,'haproxy' : 'haproxy -c -f'
   \,'html' : 'xmllint --noout --html'
+  \,'id' : 'cmd_check'
   \,'init' : 'init-checkconf'
   \,'json' : 'ruby -rjson -e ''puts JSON.parse(File.read(ARGV[0]))'''
   \,'perl' : 'perl -c -w'
@@ -18,6 +20,7 @@ let mimeCheck = {
   \,'python' : 'python -m py_compile'
   \,'ruby' : 'ruby -c'
   \,'sh' : 'sh -c'
+  \,'xml' : 'xmllint --noout'
   \,'yaml' : 'ruby -ryaml -e ''puts YAML.dump(YAML.load_file(ARGV[0]))'''
 \}
 "<SHELL_REPLACE
diff --git a/share/db/shell_replace.sh b/share/db/shell_replace.sh
new file mode 100644
index 00000000..ac33251c
--- /dev/null
+++ b/share/db/shell_replace.sh
@@ -0,0 +1,13 @@
+#!/bin/bash --login
+#
+#
+# We want a new proper bash shell, we are going to search with `set`
+#
+#
+set +e
+for f in $(shell_replace -find $NB_ROOT/*); do
+
+	echo "shell_replace $f" | sed "s; $NB_ROOT/; ;"
+	shell_replace -i.shell_replace "$f"
+
+done
diff --git a/share/db/update.sh b/share/db/update.sh
index 5c6adcdf..7fe23157 100755
--- a/share/db/update.sh
+++ b/share/db/update.sh
@@ -26,17 +26,7 @@ cat << EOF
 VACUUM;
 EOF
 
-) | sqlite3 "nb.db" && (
-
-false && for f in $(shell_replace -find $NB_ROOT/*); do
-
-	echo "shell_replace $f" | sed "s; $NB_ROOT/; ;"
-	shell_replace -i.shell_replace "$f"
-	#shell_replace "$f" | wc -l
-
-done
-
-)
+) | sqlite3 "nb.db"
 
 rm -rf "$TMP"
 }
-- 
2.47.3