diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-03-30 18:39:36 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-03-30 18:39:36 -0300 |
| commit | 694c6fbe32323c3fd59afa50fead82d20498f61a (patch) | |
| tree | 191b176ed01087dbabfd1498f78ee042bb89645d /lib | |
| parent | a0d856ef9006dae1ee8b73ccc3f348155c1885c2 (diff) | |
| download | keyringer-694c6fbe32323c3fd59afa50fead82d20498f61a.tar.gz keyringer-694c6fbe32323c3fd59afa50fead82d20498f61a.tar.bz2 | |
Do not use keyringer_exec as it would trigger keyringer_check_version again
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/keyringer/functions | 6 |
1 files changed, 4 insertions, 2 deletions
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 |