From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sun, 15 Jan 2017 01:26:05 +0000 (+0000)
Subject: commit
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=3dc7ebb341f51af098edb73ea277bcbd3602b077;p=nb.git

commit
---

diff --git a/.gitignore b/.gitignore
index efae21ac..885955f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.pyc
 .netrwhist
 *.swp
+*.bak
diff --git a/bin/nb-commit b/bin/nb-commit
index b0f4fa2a..29944487 100755
--- a/bin/nb-commit
+++ b/bin/nb-commit
@@ -2,21 +2,30 @@
 #####################################################################
 #
 # Compile, update source code
-# Called by cron/etc/nb
+# For DEV !!!
 #
 #####################################################################
 set -e
 . $(dirname "$0")/../etc/profile || exit 1; [ -z "$NB_ROOT" ] && exit
 
 cd $NB_ROOT || exit
+share/db/update.sh | sed "s,^,share/db/update.sh: ,"
 
-shell_replace -i $(grep -rIEl '^\s*.{1,3}SHELL_REPLACE') . /dev/null
+(
 
-for f in www/*/update.sh; do
+for f in $(grep -rIEl '^\s*.{1,3}SHELL_REPLACE' .); do
+  case "$f" in *.bak) continue ;; esac
+  echo "shell_replace: Update $f"
+  shell_replace -i.bak "$f"
+done
+
+for f in \
+  www/*/update.sh \
+; do
   [ -x "$f" ] || continue
-  $f
+  $f | sed "s,^,$f: ,"
 done
 
-[ -z "$*" ] && exit 0
-share/db/update.sh
+) | sed 's, \./,,'
+
 which docker 1> /dev/null && docker run --rm -v $NB_ROOT:$NB_ROOT alpine sh -c "(. $NB_ROOT/etc/profile && nb_repos) >/dev/null && echo Docker: OK"
diff --git a/www/dbq/update.sh b/www/dbq/update.sh
index 894b8c6a..1b369c6c 100755
--- a/www/dbq/update.sh
+++ b/www/dbq/update.sh
@@ -5,17 +5,14 @@ cd "$(dirname $0)"
 if minify -h|grep -qm1 no-comments; then
 
   minify='minify --no-comments'
-  # NB 14.01.17 # NB 27.12.16
-  echo Create html/default.min.css
-  $minify -o html/default.min.css html/default.css
-  echo
-  # NB 14.01.17 # NB 27.12.16
-  echo Create html/default.min.js
-  $minify -o html/default.min.js html/default.js
-  echo
 
-  exit
+  echo Update html/default.min.css
+  $minify -o html/default.min.css html/default.css > /dev/null 2>&1
+
+  echo Update html/default.min.js
+  $minify -o html/default.min.js html/default.js > /dev/null 2>&1
 
+  exit
 fi
 
 for f in $(find html -type f \( -name '*.css' -o -name '*.js' \) -a -not -name '*.min.*'); do
@@ -23,5 +20,5 @@ for f in $(find html -type f \( -name '*.css' -o -name '*.js' \) -a -not -name '
   ext="${f##*.}"
   #echo minify --$ext " < $f > $min"
   echo "$f"
-  eval minify --$ext < "$f" > "$min"
+  eval minify --$ext < "$f" > "$min.bak" && mv "$min.bak" "$min"
 done