From: garciadeblas Date: Fri, 20 Apr 2018 09:56:34 +0000 (+0200) Subject: install_osm.sh: fix osmclient dependencies: python-magic X-Git-Tag: v3.1.0~9 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=8db0ffd73126406be0b39677212a95390fe66b5e;p=osm%2Fdevops.git install_osm.sh: fix osmclient dependencies: python-magic Change-Id: Idbba2f3f785e5cdbf8486e074de462b7f469d8f9 Signed-off-by: garciadeblas --- diff --git a/installers/install_osm.sh b/installers/install_osm.sh index a0966e8d..9836bf2a 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -420,6 +420,9 @@ function install_osmclient(){ curl $key_location | sudo apt-key add - sudo add-apt-repository -y "deb [arch=amd64] $CLIENT_REPOSITORY_BASE/$CLIENT_RELEASE $CLIENT_REPOSITORY osmclient" sudo apt-get update + sudo apt-get install -y python-pip + sudo -H pip install pip==9.0.3 + sudo -H pip install python-magic sudo apt-get install -y python-osmclient #sed 's,OSM_SOL005=[^$]*,OSM_SOL005=True,' -i ${HOME}/.bashrc #echo 'export OSM_HOSTNAME=localhost' >> ${HOME}/.bashrc @@ -540,20 +543,6 @@ EONG echo "Finished deployment of lightweight build" } -function install_osmclient_sol005() { - sudo apt-get update - sudo apt-get install -y python-pip libcurl4-gnutls-dev libgnutls-dev - git -C ${LWTEMPDIR} clone https://osm.etsi.org/gerrit/osm/osmclient - sudo -H pip install -U pip - sudo -H pip install -U setuptools - pushd ${LWTEMPDIR}/osmclient - sudo -H python setup.py install - popd - #sed 's,OSM_SOL005=[^$]*,OSM_SOL005=True,' -i ~/.bashrc - echo 'export OSM_HOSTNAME=localhost' >> ${HOME}/.bashrc - echo 'export OSM_SOL005=True' >> ${HOME}/.bashrc -} - function install_lightweight() { echo "Installing lightweight build of OSM" LWTEMPDIR="$(mktemp -d -q --tmpdir "installosmlight.XXXXXX")"