|
@@ -33,16 +33,13 @@ function git_clone {
|
33
|
33
|
destination_dir="$2"
|
34
|
34
|
|
35
|
35
|
if [[ "$repo_url" == 'ssh:'* ]]; then
|
36
|
|
- retval=$(get_friends_servers)
|
37
|
|
- if [[ $retval == "0" ]]; then
|
38
|
|
- if [ "${FRIENDS_MIRRORS_SERVER}" ]; then
|
39
|
|
- if [ ${#FRIENDS_MIRRORS_SERVER} -gt 2 ]; then
|
40
|
|
- if [ "$FRIENDS_MIRRORS_PASSWORD" ]; then
|
41
|
|
- if [ ${#FRIENDS_MIRRORS_PASSWORD} -gt 2 ]; then
|
42
|
|
- echo "sshpass -p \"$FRIENDS_MIRRORS_PASSWORD\" git clone $repo_url $destination_dir"
|
43
|
|
- sshpass -p "$FRIENDS_MIRRORS_PASSWORD" git clone "$repo_url" "$destination_dir"
|
44
|
|
- return
|
45
|
|
- fi
|
|
36
|
+ if [ "${FRIENDS_MIRRORS_SERVER}" ]; then
|
|
37
|
+ if [ ${#FRIENDS_MIRRORS_SERVER} -gt 2 ]; then
|
|
38
|
+ if [ "$FRIENDS_MIRRORS_PASSWORD" ]; then
|
|
39
|
+ if [ ${#FRIENDS_MIRRORS_PASSWORD} -gt 2 ]; then
|
|
40
|
+ echo "sshpass -p \"$FRIENDS_MIRRORS_PASSWORD\" git clone $repo_url $destination_dir"
|
|
41
|
+ sshpass -p "$FRIENDS_MIRRORS_PASSWORD" git clone "$repo_url" "$destination_dir"
|
|
42
|
+ return
|
46
|
43
|
fi
|
47
|
44
|
fi
|
48
|
45
|
fi
|
|
@@ -60,7 +57,6 @@ function git_pull {
|
60
|
57
|
git stash
|
61
|
58
|
git remote set-url origin $1
|
62
|
59
|
git checkout master
|
63
|
|
- retval=$(get_friends_servers)
|
64
|
60
|
if [ "${FRIENDS_MIRRORS_SERVER}" ]; then
|
65
|
61
|
if [ ${#FRIENDS_MIRRORS_SERVER} -gt 2 ]; then
|
66
|
62
|
if [ "$FRIENDS_MIRRORS_PASSWORD" ]; then
|