From c1b1da08b36e9780de59f3bd5c22a584fdb84e09 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 22 Oct 2013 23:24:55 -0200 Subject: Rollback --- share/hydra/sync | 28 +++++++++++++--------------- 1 file 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..." -- cgit v1.2.3