fix bug realpath

diff --git a/etc/profile b/etc/profile
index 0f66d78dc085cdcb08aaf9fc2467f0f641f67191..0aaf6d615563dc65895eca39559dfe2896131690 100755 (executable)
--- a/etc/profile
+++ b/etc/profile
@@ -59,7 +59,7 @@ if [ -z "$NB_CURRENT_DIR" ]; then
 
 else
   unset NB_UNSUPORTED
-  #echo $NB_CURRENT_DIR; return
+  #echo $NB_CURRENT_DIR; #return
 
   [ -e "$NB_CURRENT_DIR/profile.d/functions" ] && . "$NB_CURRENT_DIR/profile.d/functions"
   export NB_ROOT=$(realpath $NB_CURRENT_DIR/.. 2>/dev/null)
@@ -69,10 +69,11 @@ else
   # Profiles
   #
   if [ -n "$NB_ROOT" ]; then
-    [ -e "$NB_ROOT/etc/profile.d/envs" ] && . "$NB_ROOT/etc/profile.d/envs"
+    #[ -e "$NB_ROOT/etc/profile.d/envs" ] && . "$NB_ROOT/etc/profile.d/envs"
 
       #${NB_ROOT}/etc/profile.d/*.sh 
     for i in \
+      ${NB_ROOT}/etc/profile.d/envs \
       ${NB_ROOT}/etc/profile.d/aliases \
       $(nb_repo "etc/profile" "etc/profile.d/*.sh" | grep -vFx "${NB_ROOT}/etc/profile") \
     ;do

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index 317eb8daf8d655e01e9c5ffb259c1676272b2dcb..200660038491fb2c67a14da8b03928d0c3695898 100644 (file)
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -160,7 +160,7 @@ env_add_path() {
   [ -z "$env_value" ] || echo "$env_value"
 }
 
-if !which realpath 2>/dev/null; then
+if ! which realpath >/dev/null; then
 realpath() {
   if which perl &> /dev/null; then
     perl -MFile::Spec -MCwd -e 'print File::Spec->rel2abs( Cwd::abs_path($ARGV[0]) )."\n" if -e $ARGV[0]' "$1"

diff --git a/etc/vim/source/option.vim b/etc/vim/source/option.vim
index 16cf3a0c1375785539da5b797a094e8f6a4c5a7b..7a61950f74b2f8247445b9fbdaf51415348a8490 100644 (file)
--- a/etc/vim/source/option.vim
+++ b/etc/vim/source/option.vim
@@ -29,7 +29,7 @@ set history=1000
 " NB 05.03.16   "set shellcmdflag=-c
 " NB 05.03.16   "set shell=/bin/bash\ --rcfile\ ~/.bash_profile
 " NB 05.03.16 endif
-for file in ["~/.profile", "~/.bashrc", "~/.bash_profile", "~/.zshrc"]
+for file in ["~/.profile", "~/.bashrc", "~/.bash_profile", "~/.zshrc", "/etc/profile"]
   if !empty(glob(file))
     let $BASH_ENV = file
     break

diff --git a/www/dbq/default.css b/www/dbq/default.css
index 744d2ca6f3df83445cfa3aaf06fbce2586d6a86e..553a7a37b6b2a993308b05fa2c95b063552b240f 100644 (file)
--- a/www/dbq/default.css
+++ b/www/dbq/default.css
@@ -35,13 +35,39 @@ a, a:visited {
   background-color: #3C3C3B;
 }
 
+table { border-collapse: collapse; }
+td, th { padding: 0.2em 0.7em; }
+th { font-size: 0.8em; }
+
+textarea,
+input:not([type]),
+input[type=''],
+input[type='text'] {
+  box-shadow: 0 0 5px 0 #eee;
+  border-radius: 4px;
+  border: solid 1px #eee;
+  padding: 0.4em;
+  margin-right: 0.3em;
+}
+
+form label:after {
+  content: ': ';
+}
+
+form label,
+form input,
+form select {
+  vertical-align: middle;
+}
+
 table.rows,
 div.rows,
+.menu,
 object, iframe, pre, .t2d tr
 {
   border-collapse: separate;
   border-spacing: 0;
-  padding: 0.2em 0.1em;
+  padding: 0.5em 0.2em;
   border-radius: 4px;
 
   border: solid 1px #fff;