]> git.nbdom.net Git - nb.git/commitdiff
fix bug nb-install as user
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Tue, 25 Aug 2015 00:04:01 +0000 (01:04 +0100)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Tue, 25 Aug 2015 00:04:01 +0000 (01:04 +0100)
bin/nb-install
bin/nb-update

index 92cabad55e6d741a8454d9c24eeb4dc2b12e3b20..e62ecc7323a5e8e258d972e82cf84e2825d4ab74 100755 (executable)
@@ -85,7 +85,7 @@ elif [ -w /etc/profile ]; then
   fi
 
 else
-  echo "Can't install nb.sh" 1>&2
+  echo "Can't install profile" 1>&2
 
 fi
 
index 7a144780f6b35eee1d44de3be6dd0d01cbf17514..51117c58ceb0ad05aa8dc0dd0ef29a60c3e1789d 100755 (executable)
@@ -39,7 +39,8 @@ for repo in $(nb_repo_dirs); do
   echo ">git pull $repo (user=$user)"
 
   cmd="GIT_SSH=$TMP cd \"$repo\" && git pull"
-  [ -x bin/$name-install ] && cmd="$cmd && echo '>$name-install' && bin/$name-install"
+  cmd_root="true"
+  [ -x bin/$name-install ] && cmd_root="$cmd_root && echo '>$name-install' && bin/$name-install"
 
   if [ "$USER" == "$user" ]; then
     bash -c "$cmd"
@@ -50,6 +51,8 @@ for repo in $(nb_repo_dirs); do
     continue
   fi
 
+  [ -n "$cmd_root" ] && $cmd_root
+
   ret=$?
   [ "$ret" != "0" ] && ex=$ret && echo ">err $ret"