projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install pip requirements as user
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
213db75
..
11723fe
100755
(executable)
--- 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 -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
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
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}"
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
}
echo "Finished installation of juju"
return 0
}