From 660503b43a0a81b7632659dce1a0c7a3e7b3211a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 27 Jan 2016 14:42:13 +0000 Subject: [PATCH] Don't try to mirror debian repos --- src/freedombone-trove | 44 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/src/freedombone-trove b/src/freedombone-trove index 22562b8b..285721f9 100755 --- a/src/freedombone-trove +++ b/src/freedombone-trove @@ -156,30 +156,32 @@ function sync_trove_repos { for line in "${REPOS[@]}" do repo_name=$(echo "$line" | awk -F '=' '{print $1}') - repo_url=$(echo "$line" | awk -F '=' '{print $2}' | awk -F '"' '{print $2}') - trove_name=$(echo "$repo_name" | sed "s|_REPO||g" | awk '{print tolower($0)}') - if [[ $NEW_TROVE == 'yes' ]]; then - if [ -d /home/trove/${trove_name} ]; then - rm -rf /home/trove/${trove_name} + if [[ ${repo_name} != *".debian."* ]]; then + repo_url=$(echo "$line" | awk -F '=' '{print $2}' | awk -F '"' '{print $2}') + trove_name=$(echo "$repo_name" | sed "s|_REPO||g" | awk '{print tolower($0)}') + if [[ $NEW_TROVE == 'yes' ]]; then + if [ -d /home/trove/${trove_name} ]; then + rm -rf /home/trove/${trove_name} + fi fi - fi - if [ ! -d /home/trove/${trove_name} ]; then - if [[ ${repo_url} != 'ssh:'* ]]; then - git clone --mirror ${repo_url} /home/trove/${trove_name} - else - sshpass -p "$FRIENDS_TROVE_PASSWORD" git clone --mirror ${repo_url} /home/trove/${trove_name} - fi if [ ! -d /home/trove/${trove_name} ]; then - echo $"WARNING: failed to mirror repo ${repo_url}" + if [[ ${repo_url} != 'ssh:'* ]]; then + git clone --mirror ${repo_url} /home/trove/${trove_name} + else + sshpass -p "$FRIENDS_TROVE_PASSWORD" git clone --mirror ${repo_url} /home/trove/${trove_name} + fi + if [ ! -d /home/trove/${trove_name} ]; then + echo $"WARNING: failed to mirror repo ${repo_url}" + fi + else + cd /home/trove/${trove_name} + git remote set-url origin ${repo_url} + if [[ ${repo_url} != 'ssh:'* ]]; then + git fetch -p origin + else + sshpass -p "$FRIENDS_TROVE_PASSWORD" git fetch -p origin + fi fi - else - cd /home/trove/${trove_name} - git remote set-url origin ${repo_url} - if [[ ${repo_url} != 'ssh:'* ]]; then - git fetch -p origin - else - sshpass -p "$FRIENDS_TROVE_PASSWORD" git fetch -p origin - fi fi done chown -R trove:trove /home/trove