From b8c84c812650d76e8871a40e7e5051bb5f894553 Mon Sep 17 00:00:00 2001 From: ManUtopiK Date: Wed, 7 Dec 2022 19:11:37 +0100 Subject: [PATCH 1/3] Prevent apt install on other distro on setup --- setup.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/setup.sh b/setup.sh index 0c9a850..deea56d 100755 --- a/setup.sh +++ b/setup.sh @@ -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 -- 2.39.2 From b7d55cfb89b34759ecaf2802442e80295028830b Mon Sep 17 00:00:00 2001 From: ManUtopiK Date: Wed, 7 Dec 2022 19:12:37 +0100 Subject: [PATCH 2/3] fix 'NoneType' and 'str' when DUNITER env not found --- jaklis.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jaklis.py b/jaklis.py index c5c397c..ec9e83f 100755 --- a/jaklis.py +++ b/jaklis.py @@ -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') + 'gva' + +if not duniter: + node = "https://g1.librelois.fr/gva" +else: + node = os.getenv('DUNITER') + '/gva' pod = os.getenv('ESNODE') if not pod: -- 2.39.2 From 44a7feddd1887cadcdc35735f5d1586bc136cd26 Mon Sep 17 00:00:00 2001 From: ManUtopiK Date: Wed, 7 Dec 2022 19:19:50 +0100 Subject: [PATCH 3/3] oups. --- jaklis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jaklis.py b/jaklis.py index ec9e83f..c2398f9 100755 --- a/jaklis.py +++ b/jaklis.py @@ -17,7 +17,7 @@ dotenv_path = join(dirname(__file__),MY_PATH + '.env') load_dotenv(dotenv_path) # Set global values (default parameters) , regarding variables environments -duniter = os.getenv('DUNITER') + 'gva' +duniter = os.getenv('DUNITER') if not duniter: node = "https://g1.librelois.fr/gva" -- 2.39.2