From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 30 Mar 2012 21:39:36 +0000 (-0300)
Subject: Do not use keyringer_exec as it would trigger keyringer_check_version again
X-Git-Tag: 0.2.1~72
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=694c6fbe32323c3fd59afa50fead82d20498f61a;p=keyringer.git

Do not use keyringer_exec as it would trigger keyringer_check_version again
---

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 3022bbe..9d8498b 100644
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -232,7 +232,8 @@ function keyringer_check_version {
   if [ ! -f "$VERSION_INFO" ]; then
     echo "Configuration version file not found, trying to pull from remotes..."
     for remote in "$BASEDIR/.git/refs/remotes/*"; do
-      keyringer_exec git "$BASEDIR" pull `basename $remote` master
+      # Do not use keyringer_exec as it would trigger keyringer_check_version again
+      ( cd "$BASEDIR" && git pull `basename $remote` master )
     done
 
     if [ ! -f "$VERSION_INFO" ]; then
@@ -254,7 +255,8 @@ function keyringer_check_version {
   if [ "$VERSION" != "$KEYRINGER_VERSION" ]; then
     echo "Configuration version differs from keyringer version, trying to pull from remotes"
     for remote in "$BASEDIR/.git/refs/remotes/*"; do
-      keyringer_exec git "$BASEDIR" pull `basename $remote` master
+      # Do not use keyringer_exec as it would trigger keyringer_check_version again
+      ( cd "$BASEDIR" && git pull `basename $remote` master )
     done
 
     if [ "$VERSION" != "$KEYRINGER_VERSION" ]; then