From 03c37f00f1971c735962b21e496a2d02ac62c497 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Fri, 6 Dec 2019 19:54:13 +0000
Subject: [PATCH] Add force requirements options, autodetect libsodium version

---
 .install/install_requirements.sh | 3 ++-
 install.sh                       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.install/install_requirements.sh b/.install/install_requirements.sh
index 4320b7e..9ce3823 100755
--- a/.install/install_requirements.sh
+++ b/.install/install_requirements.sh
@@ -9,7 +9,8 @@ sudo apt update
 sudo apt install curl jq -y
 
 # Silkaj + Duniterpy
-sudo apt install python3-pip libsodium18 -y
+libsodium=$(sudo apt search libsodium | grep -v "header" | grep "Network communication" -B1 | head -n1 | awk -F '/' '{ print $1 }')
+sudo apt install python3-pip $libsodium -y
 pip3 install silkaj
 
 # Install IPFS
diff --git a/install.sh b/install.sh
index 6ce18be..df81a6b 100755
--- a/install.sh
+++ b/install.sh
@@ -9,6 +9,7 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 init_loc="$MY_PATH/shell/init.sh"
 now=$(date +%Y-%m-%d)
 repOption=$1
+#force_req="o"
 
 ## Update G1sms+ code
 git pull
@@ -24,7 +25,7 @@ $MY_PATH/.install/export_colors.sh
 [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases
 
 ## Vérifie si IPFS est installé
-if [[ -z $(which ipfs) || -z $(which gammu) ]];then
+if [[ $force_req == "o" || -z $(which ipfs) || -z $(which gammu) ]];then
     echo -e "${c_yellow}IPFS ou gammu n'ont pas été détectés sur votre machine, nous allons installer tous les prérequis...$c_"
     $MY_PATH/.install/install_requirements.sh
     $MY_PATH/.install/configure_ipfs_layer.sh