diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/requirements-dev.pip | 4 | ||||
| -rw-r--r-- | pkg/requirements.pip | 4 | ||||
| -rwxr-xr-x | pkg/scripts/bitmask_bootstrap.sh | 51 |
3 files changed, 43 insertions, 16 deletions
diff --git a/pkg/requirements-dev.pip b/pkg/requirements-dev.pip index 71ffdc37..8b5a8d85 100644 --- a/pkg/requirements-dev.pip +++ b/pkg/requirements-dev.pip @@ -13,5 +13,5 @@ sphinx --e git+git://github.com/leapcode/leap_pycommon.git@develop#egg=leap.common --e git+git://github.com/leapcode/soledad.git@develop#egg=leap.soledad +-e git+https://github.com/leapcode/leap_pycommon.git@develop#egg=leap.common +-e git+https://github.com/leapcode/soledad.git@develop#egg=leap.soledad diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 35486dac..458db39c 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -19,8 +19,8 @@ keyring leap.common>=0.3.4 leap.soledad.client>=0.4.0 -leap.keymanager>=0.3.3 -leap.mail>=0.3.4 +leap.keymanager>=0.3.4 +leap.mail>=0.3.5 # Remove this when u1db fixes its dependency on oauth oauth diff --git a/pkg/scripts/bitmask_bootstrap.sh b/pkg/scripts/bitmask_bootstrap.sh index bd568ebd..70f9867e 100755 --- a/pkg/scripts/bitmask_bootstrap.sh +++ b/pkg/scripts/bitmask_bootstrap.sh @@ -1,10 +1,34 @@ #!/bin/bash - +###################################################################### +# bitmask_boostrap.sh +# Copyright (C) 2013 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +###################################################################### # Installs requirements, and # clones the latest leap-client # depends on: -# openvpn git-core libgnutls-dev python-dev python-qt4 python-setuptools python-virtualenv +# (authoritative list under docs/dev/quickstart.rst) + +# git python-dev python-setuptools python-virtualenv python-pip python-openssl libsqlite3-dev g++ openvpn +# pyside-tools python-pyside python-qt4 + +# Clone latest git (develop branch) +# change "develop" for any other branch you want. +BRANCH="develop" +BITMASK_DIR="bitmask-develop" # Escape code esc=`echo -en "\033"` @@ -23,27 +47,30 @@ echo "~~~~~~~~~~~~~~~~~~~~~~~" echo "" echo "${cc_green}Creating virtualenv...${cc_normal}" -mkdir bitmask-testbuild -virtualenv bitmask-testbuild -source bitmask-testbuild/bin/activate +mkdir ${BITMASK_DIR} +virtualenv "${BITMASK_DIR}" +source ./${BITMASK_DIR}/bin/activate echo "${cc_green}Installing bitmask...${cc_normal}" -# Clone latest git (develop branch) -# change "develop" for any other branch you want. - +pip install -e 'git+https://leap.se/git/bitmask_client@'${BRANCH}'#egg=leap.bitmask' -pip install -e 'git+https://leap.se/git/bitmask_client@develop#egg=leap.bitmask' - -cd bitmask-testbuild +cd ${BITMASK_DIR} # symlink the pyside libraries to the system libs ./src/leap.bitmask/pkg/postmkvenv.sh +cd ./src/leap.bitmask +make +cd ../../ +source ./bin/activate + echo "${cc_green}bitmask installed! =)" echo "${cc_yellow}" echo "Launch it with: " echo "~~~~~~~~~~~~~~~~~~~~~~" -echo "bin/bitmask" +echo "bin/bitmask --debug" echo "~~~~~~~~~~~~~~~~~~~~~~" +echo "If you are not inside the virtualenv, source it first with " +echo "source "${BITMASK_DIR}"/bin/activate" echo "${cc_normal}" |