summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-10-22 23:24:55 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-10-22 23:24:55 -0200
commitc1b1da08b36e9780de59f3bd5c22a584fdb84e09 (patch)
tree4d35ced303b8f89c787cc79e664696fcebacb719
parent21e82b5c43fcdc21014b087e63dfc62b8f073b21 (diff)
downloadhydra-c1b1da08b36e9780de59f3bd5c22a584fdb84e09.tar.gz
hydra-c1b1da08b36e9780de59f3bd5c22a584fdb84e09.tar.bz2
Rollback
-rwxr-xr-xshare/hydra/sync28
1 files changed, 13 insertions, 15 deletions
diff --git a/share/hydra/sync b/share/hydra/sync
index 8ff57da..44f6f14 100755
--- a/share/hydra/sync
+++ b/share/hydra/sync
@@ -40,21 +40,6 @@ function hydra_sync {
fi
fi
done
-
- # Update keyring.
- if [ "$UPDATE_KEYRINGER" != "no" ]; then
- if ! which keyringer &> /dev/null; then
- echo "Please install keyringer for a full hydra experience."
- elif [ ! -e "$HOME/.keyringer/$HYDRA" ]; then
- echo "Initializing keyring for $HYDRA..."
- keyringer $HYDRA init $HYDRA_FOLDER/$repository
- fi
-
- echo "Syncing keyringer..."
- keyringer $HYDRA git pull
- fi
-
- UPDATE_KEYRINGER="no"
}
# Basic parameters.
@@ -73,6 +58,19 @@ done
# TODO: split between public and private repositories
hydra_sync $REPOSITORIES
+# Update keyring.
+if [ "$UPDATE_KEYRINGER" != "no" ]; then
+ if ! which keyringer &> /dev/null; then
+ echo "Please install keyringer for a full hydra experience."
+ elif [ ! -e "$HOME/.keyringer/$HYDRA" ]; then
+ echo "Initializing keyring for $HYDRA..."
+ keyringer $HYDRA init $HYDRA_FOLDER/$repository
+ fi
+
+ echo "Syncing keyringer..."
+ keyringer $HYDRA git pull
+fi
+
# Update puppet configuration.
if [ -z "$PUPPET" ]; then
echo "Searching for a puppet repository at $BASEDIR..."