no -a for ls, nb-install fix wrong user

diff --git a/bin/nb-install b/bin/nb-install
index a47a68e5ec2a0827114c9e71dfe9a5bcba61f244..c8bf12f1adae5dc5c846c5fb7c84d80bfbe2d255 100755 (executable)
--- a/bin/nb-install
+++ b/bin/nb-install
@@ -20,6 +20,7 @@ case "$@" in *-n*) INSTALL="$INSTALL -n";; esac
 # Functions
 #
 function verbose() {
+  [ -z "$@" ] && return
   printf '> %s\n' "$@"
 }
 
@@ -83,6 +84,12 @@ fi
 #
 chmod 755 $NB_ROOT/etc/vim/vim* $NB_ROOT/etc/vim/*.sh $NB_ROOT/etc/vim/*.pl $NB_ROOT/etc/vim/vimplate-dump
 
+#
+# Log
+#
+NB_USER=`(ls -dl $NB_ROOT 2>/dev/null || printf '1 2 root') | awk '{print $3}'`
+verbose $(chown "$NB_USER" /var/log/nb.log 2> /dev/null)
+
 #
 # Bye
 #

diff --git a/bin/nb-update b/bin/nb-update
index b1de8a3d743df6c4b5ae24ab82be1ff0858e0b5f..4a9dc3b8b7b4eeefb76083263c4147c06b3ed151 100755 (executable)
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -8,27 +8,11 @@
 declare -r NAME="$(basename "${0}")"
 
 #####################################################################
-# Git pull
-#
-echo ">git pull $NB_ROOT"
-cd $NB_ROOT || exit
-git pull
-
-#####################################################################
-# Install
-#
-echo ">nb-install"
-nb-install
-
-NB_USER=`(ls -dl . 2>/dev/null || printf '1 2 root') | awk '{print $3}'`
-echo ">Owner: $NB_USER"
-chown "$NB_USER" /var/log/nb.log 2> /dev/null
-
-#####################################################################
-# Others git repos from nbdom
+# Gits pull
 #
 ex=0
 for repo in \
+  $NB_ROOT \
   /opt/backup_servers \
   /{opt,home/www}/rent \
   /etc/puppet \
@@ -52,6 +36,12 @@ for repo in \
 
 done
 
+#####################################################################
+# Install
+#
+echo ">nb-install"
+nb-install
+
 #####################################################################
 # End
 #

diff --git a/etc/bashrc b/etc/bashrc
index b5e36d11fb4b40171fbe39da4c8f336e0f5615f9..abcfadbaff62a1c654fc8fb0308bea88030b0b1c 100644 (file)
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -48,6 +48,7 @@ export PYTHONPATH=`nb_env_add_path "$PYTHONPATH" $NB_ROOT/lib`
 export IGNOREEOF=0
 export LESS="-iMR"
 export EDITOR=vim
+case "$OSTYPE" in darwin*) export DARWIN=1;; esac
 
 #
 # Color
@@ -85,15 +86,20 @@ fi
 #
 # ls
 #
-ls_opt='-a'
-case "$OSTYPE" in darwin*) DARWIN=1;; esac
+ls_opt=''
+ll_opt=''
+
 if [ -n "$DARWIN" ]; then
   [ "$color_prompt" = yes ] && ls_opt="$ls_opt -G"
 else
-  ls_opt="$ls_opt --time-style=long-iso"
   [ "$color_prompt" = yes ] && ls_opt="$ls_opt --color=auto"
+  ll_opt="$ll_opt --time-style=long-iso"
 fi
-[ "$ls_opt" = "" ] || alias ls="ls $ls_opt"
-unset ls_opt
-alias ll='ls -lh'
-unset color char color_prompt h
+
+[ "$ls_opt" = "" ] || alias ls="ls${ls_opt}"
+alias ll="ls -alh${ll_opt}"
+
+#
+# bye
+#
+unset i color char color_prompt h ls_opt ll_opt