From c0d778f7c64d2e1af68fdd61cbf0ee7f219701b0 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sun, 17 Jan 2016 01:48:57 +0000
Subject: [PATCH] nb-update nb-update, repos

---
 bin/nb-install   |  2 +-
 bin/nb-repo-dirs | 17 ++++++++++++-----
 bin/nb-update    |  8 +++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/bin/nb-install b/bin/nb-install
index e62ecc73..13269aac 100755
--- a/bin/nb-install
+++ b/bin/nb-install
@@ -85,7 +85,7 @@ elif [ -w /etc/profile ]; then
   fi
 
 else
-  echo "Can't install profile" 1>&2
+  echo "Can't install /etc/profile. Directory not exists or wrong permission" 1>&2
 
 fi
 
diff --git a/bin/nb-repo-dirs b/bin/nb-repo-dirs
index 2eccb810..55d804c6 100755
--- a/bin/nb-repo-dirs
+++ b/bin/nb-repo-dirs
@@ -12,18 +12,25 @@ my @DIRS = (
 	dirname ( dirname ( File::Spec->rel2abs( Cwd::abs_path(__FILE__) ) ) ),
 	'/opt/backup_servers',
 	'/{opt,home/www}/rent',
-	'root:/etc/puppet',
-	'root:/etc/zaza',
+	'/etc/puppet',
+	'/etc/zaza',
 	'/etc/puppet/data',
 	'/etc/puppet/modules',
 	'/home/www/izideal',
-	'/home/*/Dev/*/.nb-install',
-	'/usr/local/src/*/.nb-install',
-	'/{opt,home,home/www}/*/.nb-install',
+#	'/opt/*/.nb-install',
+#	'/home/*/.nb-install',
+#	'/home/www/*/.nb-install',
+#	'/home/*/Dev/*/.nb-install',
+#	'/usr/local/src/*/.nb-install',
+	'/{opt,home,home/www,usr/local/src,home/*/Dev}/*/.nb-install',
 );
 
 my $debug = 0;
 ($ARGV[0]||'') =~ /^--?(all|debug)$/ and $debug = 1;
+if ($ARGV[0]||'' =~ /^--?(all|debug)$/) {
+  print map {"$_\n"} @DIRS;
+  exit 0;
+}
 
 my %h;
 
diff --git a/bin/nb-update b/bin/nb-update
index 53a9af47..886c1c34 100755
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -34,8 +34,6 @@ for repo in $(nb_repo_dirs); do
   echo ">git pull $repo (user=$user)"
 
   cmd="GIT_SSH=$TMP cd \"$repo\" && git pull"
-  cmd_root="true"
-  [ -x bin/$name-install ] && cmd_root="$cmd_root && (echo '>$name-install' && bin/$name-install)|sed 's/^/  /'"
 
   if [ "$USER" == "$user" ]; then
     bash -c "$cmd"
@@ -45,12 +43,16 @@ for repo in $(nb_repo_dirs); do
     echo "Ignore $repo: current user=$USER repo user=$user"
     continue
   fi
-
   ret=$?
+
   if [ "$ret" != "0" ]; then
     ex=$ret && echo ">err $ret"
+
   else
+    cmd_root="true"
+    [ -x bin/$name-install ] && cmd_root="$cmd_root && (echo '>$name-install' && bin/$name-install)|sed 's/^/  /'"
     [ "$cmd_root" == "true" ] || eval "$cmd_root" || echo ">err"
+
   fi
 
   echo
-- 
2.47.3