summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-03-30 18:40:44 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-03-30 18:40:44 -0300
commit54b8f9a57106949a4e81f3112744855e872f781e (patch)
tree3374380d8444f6cb0ce477cc1ded38623ed27cd6
parent694c6fbe32323c3fd59afa50fead82d20498f61a (diff)
downloadkeyringer-0.1.tar.gz
keyringer-0.1.tar.bz2
Using just git pull at keyringer_check_version0.1
-rw-r--r--lib/keyringer/functions12
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 9d8498b..6ac8bf8 100644
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -231,10 +231,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
- # Do not use keyringer_exec as it would trigger keyringer_check_version again
- ( cd "$BASEDIR" && git pull `basename $remote` master )
- done
+ # Do not use keyringer_exec as it would trigger keyringer_check_version again
+ ( cd "$BASEDIR" && git pull )
if [ ! -f "$VERSION_INFO" ]; then
echo "Creating configuration version file..."
@@ -254,10 +252,8 @@ function keyringer_check_version {
# Check if config version is supported by keyringer
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
- # Do not use keyringer_exec as it would trigger keyringer_check_version again
- ( cd "$BASEDIR" && git pull `basename $remote` master )
- done
+ # Do not use keyringer_exec as it would trigger keyringer_check_version again
+ ( cd "$BASEDIR" && git pull )
if [ "$VERSION" != "$KEYRINGER_VERSION" ]; then
NEWEST="`echo -e "$VERSION\n$KEYRINGER_VERSION" | sort -V | tail -n 1`"