From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Fri, 21 Aug 2015 18:07:30 +0000 (+0100)
Subject: install,envs,nb_repo_dirs
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=303a73ca738dd2c85a19e91b22618d2e28d2d1a6;p=nb.git

install,envs,nb_repo_dirs
---

diff --git a/bin/nb-update b/bin/nb-update
index a4759e56..7a144780 100755
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -19,16 +19,7 @@ ex=0
 printf '#!%s\n%s\n' `which sh` 'ssh -o BatchMode=yes $@' > "$TMP" && chmod 755 "$TMP"
 export GIT_SSH="$TMP"
 
-for repo in \
-  $((ls /{opt,home,home/www}/*/.nb-install | xargs -n1 dirname) 2>/dev/null) \
-  $NB_ROOT \
-  /opt/backup_servers \
-  /{opt,home/www}/rent \
-  root:/etc/puppet \
-  /etc/puppet/data \
-  /etc/puppet/modules \
-  /home/www/izideal \
-; do
+for repo in $(nb_repo_dirs); do
 
   # Check dir
   [ -d "$repo/.git" ] || continue
diff --git a/etc/profile.d/envs b/etc/profile.d/envs
index a38dd6e8..055f0e10 100644
--- a/etc/profile.d/envs
+++ b/etc/profile.d/envs
@@ -3,13 +3,6 @@
 # ENVS
 #
 #################################################################################
-# NB 28.07.15 case "$BASH_SOURCE" in */*) path="${BASH_SOURCE%/*}";; *) path='.' ;; esac
-# NB 28.07.15 #
-# NB 28.07.15 # ROOT PATH
-# NB 28.07.15 #
-# NB 28.07.15 [ -e "$path/bashrc.function" ] && . "$path/bashrc.function"
-# NB 28.07.15 NB_ROOT=$(realpath ${path}/..)
-# NB 28.07.15 unset path
 
 #
 # BASE
@@ -32,13 +25,12 @@ env_add_path &>/dev/null && PATH=`env_add_path "$PATH" \
   /opt/local/sbin \
   /usr/local/bin \
   /usr/local/sbin \
-  $NB_ROOT/bin \
-  $NB_ROOT/sbin \
   $HOME/bin \
   $HOME/sbin \
 	/usr/share/awstats/tools \
 	/home/bin \
 	/home/www/wp/bin \
+  $(nb_repo_dirs | xargs -n1 -IZ printf '%s\n%s\n' "Z/bin" "Z/sbin" 2>/dev/null)
 `
 export PATH
 
diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index 9633d768..7f1b0775 100644
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -85,8 +85,10 @@ env_add_path() {
     case "${env_value}" in
       *:$p|*:$p:*|$p:*|$p) continue;;
     esac
-    [ -z "$env_value" ] || env_value=":${env_value}"
-    env_value="${p}${env_value}"
+    [ -z "$env_value" ] || env_value="${env_value}:"
+    env_value="${env_value}${p}"
+# NB 21.08.15     [ -z "$env_value" ] || env_value=":${env_value}"
+# NB 21.08.15     env_value="${p}${env_value}"
   done
 
   [ -z "$env_value" ] || echo "$env_value"
@@ -312,4 +314,17 @@ jpg2avi() {
   rm -f "$still"
 }
 
-
+nb_repo_dirs() {
+  (
+    echo "
+      $NB_ROOT
+      /opt/backup_servers
+      /{opt,home/www}/rent
+      root:/etc/puppet
+      /etc/puppet/data
+      /etc/puppet/modules
+      /home/www/izideal
+    "
+    (ls /{opt,home,home/www}/*/.nb-install | xargs -n1 dirname) 2>/dev/null
+  ) | perl -ne '/^\s*$/ and next; s/^\s+//; print'
+}