X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=11723febbe27d4e5c1638a3ef0e52f90a95b90df;hb=021b307297a6ab8dfe9ee3af03154989bcd9e0e8;hp=213db7560124ef26d7aa0965b50ee80e989e9fea;hpb=f7eefb25d54e4f4481004760f95f3e819e783ef1;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 213db756..11723feb 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -341,11 +341,11 @@ function install_osmclient(){ sudo -H LC_ALL=C python3 -m pip install -U python-magic pyangbind verboselogs sudo apt-get install -y python3-osm-im python3-osmclient if [ -f /usr/lib/python3/dist-packages/osm_im/requirements.txt ]; then - sudo -H LC_ALL=C python3 -m pip install -r /usr/lib/python3/dist-packages/osm_im/requirements.txt + python3 -m pip install -r /usr/lib/python3/dist-packages/osm_im/requirements.txt fi if [ -f /usr/lib/python3/dist-packages/osmclient/requirements.txt ]; then sudo apt-get install -y libcurl4-openssl-dev libssl-dev - sudo -H LC_ALL=C python3 -m pip install -r /usr/lib/python3/dist-packages/osmclient/requirements.txt + python3 -m pip install -r /usr/lib/python3/dist-packages/osmclient/requirements.txt fi #sed 's,OSM_SOL005=[^$]*,OSM_SOL005=True,' -i ${HOME}/.bashrc #echo 'export OSM_HOSTNAME=localhost' >> ${HOME}/.bashrc @@ -452,7 +452,7 @@ function install_juju() { echo "Installing juju" sudo snap install juju --classic --channel=2.8/stable [[ ":$PATH": != *":/snap/bin:"* ]] && PATH="/snap/bin:${PATH}" - [ -n "$INSTALL_NOCACHELXDIMAGES" ] && update_juju_images + [ -n "$INSTALL_NOCACHELXDIMAGES" ] || update_juju_images echo "Finished installation of juju" return 0 }