diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-15 10:35:43 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-15 10:35:43 -0300 |
| commit | d51d6bedfecd41491f2c8243235e7d3db043a4d7 (patch) | |
| tree | 3d6152565be983d0e6ddc1fb0ce764bee060fc25 /pkg | |
| parent | 23e9034664edf6b2a01a677c4fa4e6efd880e364 (diff) | |
| parent | 72f53cc32bf20b00bcbd5f28bab5fc25250215bf (diff) | |
Merge branch 'release-0.3.7'0.3.7
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/requirements.pip | 4 | ||||
| -rwxr-xr-x | pkg/scripts/bootstrap_develop.sh | 26 |
2 files changed, 20 insertions, 10 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 885b19f8..04cd33de 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -20,8 +20,8 @@ zope.proxy leap.common>=0.3.4 leap.soledad.client>=0.4.2 -leap.keymanager>=0.3.4 -leap.mail>=0.3.6 +leap.keymanager>=0.3.6 +leap.mail>=0.3.7 # Remove this when u1db fixes its dependency on oauth oauth diff --git a/pkg/scripts/bootstrap_develop.sh b/pkg/scripts/bootstrap_develop.sh index 4660c499..07063a81 100755 --- a/pkg/scripts/bootstrap_develop.sh +++ b/pkg/scripts/bootstrap_develop.sh @@ -38,12 +38,21 @@ clone_repos() { echo "${cc_green}Status: $status...${cc_normal}" set -x # show commands - # clone the leap.se repos - git clone ssh://gitolite@leap.se/bitmask_client - git clone ssh://gitolite@leap.se/leap_pycommon - git clone ssh://gitolite@leap.se/soledad - git clone ssh://gitolite@leap.se/keymanager - git clone ssh://gitolite@leap.se/leap_mail + if [[ "$1" == "ro" ]]; then + # read-only remotes: + git clone https://leap.se/git/bitmask_client + git clone https://leap.se/git/leap_pycommon + git clone https://leap.se/git/soledad + git clone https://leap.se/git/keymanager + git clone https://leap.se/git/leap_mail + else + # read-write remotes: + git clone ssh://gitolite@leap.se/bitmask_client + git clone ssh://gitolite@leap.se/leap_pycommon + git clone ssh://gitolite@leap.se/soledad + git clone ssh://gitolite@leap.se/keymanager + git clone ssh://gitolite@leap.se/leap_mail + fi set +x echo "${cc_green}Status: $status done!${cc_normal}" @@ -129,7 +138,7 @@ finish(){ } initialize() { - clone_repos + clone_repos $1 checkout_develop create_venv setup_develop @@ -169,6 +178,7 @@ help() { echo "Usage: $0 {init | update | help}" echo echo " init : Initialize repositories, create virtualenv and \`python setup.py develop\` all." + echo " You can use \`init ro\` in order to use the https remotes if you don't have rw access." echo " update : Update the repositories and install new deps (if needed)." echo " run : Runs the client (any extra parameters will be sent to the app)." echo " help : Show this help" @@ -177,7 +187,7 @@ help() { case "$1" in init) - initialize + initialize $2 ;; update) update |