]> gitweb.fluxo.info Git - keyringer.git/commitdiff
Using just git pull at keyringer_check_version 0.1
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 30 Mar 2012 21:40:44 +0000 (18:40 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 30 Mar 2012 21:40:44 +0000 (18:40 -0300)
lib/keyringer/functions

index 9d8498b09e34b4269fb45db96d759b1f968fdad2..6ac8bf834ed597ac473f24b40fd1bb35d0203f89 100644 (file)
@@ -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`"