nb-update nb-update, repos

diff --git a/bin/nb-install b/bin/nb-install
index e62ecc7323a5e8e258d972e82cf84e2825d4ab74..13269aacdc6cb8f2dd8dd08f5d4ab9bcaf3ebef5 100755 (executable)
--- 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 2eccb81066d1504a8dec193aafb0c49e9cd37b41..55d804c6d52bb72d108f505aaec3b7a04f678223 100755 (executable)
--- 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 53a9af4779990777e067e5ededabfae4a2f7cfcd..886c1c347bcbab82c0a8d83150867e3d69cbf78d 100755 (executable)
--- 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