fix setup and no env DUNITER #21

Closed
ManUtopiK wants to merge 3 commits from ManUtopiK/jaklis:master into master
2 changed files with 17 additions and 10 deletions

View File

@ -17,9 +17,12 @@ dotenv_path = join(dirname(__file__),MY_PATH + '.env')
load_dotenv(dotenv_path)
# Set global values (default parameters) , regarding variables environments
node = os.getenv('DUNITER') + '/gva'
if not node:
node="https://g1.librelois.fr/gva"
duniter = os.getenv('DUNITER')
if not duniter:
node = "https://g1.librelois.fr/gva"
else:
node = os.getenv('DUNITER') + '/gva'
pod = os.getenv('ESNODE')
if not pod:

View File

@ -2,13 +2,17 @@
hasError=0
for i in gcc python3-pip python3-setuptools libpq-dev python3-dev python3-wheel; do
if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
[[ ! $j ]] && sudo apt update
sudo apt install -y $i
j=1
fi
done
if [ -f "/etc/arch-release" ]; then
echo '! jaklis needs gcc python3-pip python3-setuptools libpq-dev python3-dev python3-wheel'
elif [ -f "/etc/lsb-release" ]; then # ubuntu
for i in gcc python3-pip python3-setuptools libpq-dev python3-dev python3-wheel; do
if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
[[ ! $j ]] && sudo apt update
sudo apt install -y $i
j=1
fi
done
fi
pip3 install -r requirements.txt || hasError=1
chmod u+x jaklis.py