diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-08-04 14:59:36 +0200 | 
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-08-05 17:35:21 -0400 | 
| commit | f1639503a58c76b00afc0a22b7928661dd08c771 (patch) | |
| tree | 4a20c09ea4cd5698778f9f5d98b6f2918d38eabf | |
| parent | 0a8f455965fff778d993912f1dc11a77db264a93 (diff) | |
[feat] WHEELHOUSE can be a url + --use-leap-wheels
--use-leap-wheels sets --trusted-host (remove it when we have a proper
  cert) and WHEELHOUSE to https://ftp.lizard.leap.se
Until we get ftp.lizard cname, use lizard as the wheels server.
| -rwxr-xr-x | pkg/pip_install_requirements.sh | 53 | 
1 files changed, 35 insertions, 18 deletions
| diff --git a/pkg/pip_install_requirements.sh b/pkg/pip_install_requirements.sh index 949f738..6d8ed28 100755 --- a/pkg/pip_install_requirements.sh +++ b/pkg/pip_install_requirements.sh @@ -1,38 +1,31 @@ -#!/bin/sh +#!/bin/bash  # Update pip and install LEAP base/testing requirements.  # For convenience, $insecure_packages are allowed with insecure flags enabled.  # Use at your own risk.  # See $usage for help  insecure_packages="dirspec" - -return_wheelhouse() { -    if [ "$WHEELHOUSE" = "" ]; then -	WHEELHOUSE=$HOME/wheelhouse -    fi - -    if [ ! -d "$WHEELHOUSE" ]; then -	mkdir $WHEELHOUSE -    fi - -    echo "$WHEELHOUSE" -} +leap_wheelhouse=https://lizard.leap.se/wheels  show_help() { -    usage="Usage: $0 [--testing]\n --testing\tInstall dependencies from requirements-testing.pip\n -\t\tOtherwise, it will install requirements.pip" -    echo $usage +    usage="Usage: $0 [--testing] [--use-leap-wheels]\n --testing\t\tInstall dependencies from requirements-testing.pip\n +\t\t\tOtherwise, it will install requirements.pip\n +--use-leap-wheels\tUse wheels from leap.se" +    echo -e $usage      exit 1  }  process_arguments() {      testing=false +    use_leap_wheels=false +      while [ "$#" -gt 0 ]; do  	# From http://stackoverflow.com/a/31443098  	case "$1" in  	    --help) show_help;;  	    --testing) testing=true; shift 1;; +	    --use-leap-wheels) use_leap_wheels=true; shift 1;;  	    -h) show_help;;  	    -*) echo "unknown option: $1" >&2; exit 1;; @@ -40,6 +33,31 @@ process_arguments() {      done  } +return_wheelhouse() { +    if $use_leap_wheels ; then +	WHEELHOUSE=$leap_wheelhouse +    elif [ "$WHEELHOUSE" = "" ]; then +	WHEELHOUSE=$HOME/wheelhouse +    fi + +    # Tested with bash and zsh +    if [[ $WHEELHOUSE != http* && ! -d "$WHEELHOUSE" ]]; then +	    mkdir $WHEELHOUSE +    fi + +    echo "$WHEELHOUSE" +} + +return_install_options() { +    wheelhouse=`return_wheelhouse` +    install_options="-U --find-links=$wheelhouse" +    if $use_leap_wheels ; then +	install_options="$install_options --trusted-host lizard.leap.se" +    fi + +    echo $install_options +} +  return_insecure_flags() {      for insecure_package in $insecure_packages; do  	flags="$flags --allow-external $insecure_package --allow-unverified $insecure_package" @@ -59,8 +77,7 @@ return_packages() {  }  process_arguments $@ -wheelhouse=`return_wheelhouse` -install_options="-U --find-links=$wheelhouse" +install_options=`return_install_options`  insecure_flags=`return_insecure_flags`  packages=`return_packages` | 
