From f36f676fbde90d8f3e06ecb987da57c63c290a51 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sun, 15 Aug 2021 20:05:53 +0200
Subject: [PATCH] install better

---
 install.sh | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index d4a398f..b62e89f 100755
--- a/install.sh
+++ b/install.sh
@@ -13,15 +13,32 @@ then
 # Check requirements
 echo "AstrXbian installateur pour XBIAN (https://xbian.org) distributions DEBIAN et dérivées (https://www.linuxmint.com/)"
 sudo apt-get update
-sudo apt-get install git fail2ban inotify-tools curl net-tools libsodium* python3-dev python3-pip python3-setuptools python3-wheel python3-dotenv mpack libssl-dev libffi-dev -y
-sudo apt-get install build-essential qrencode jq bc gawk ffmpeg sqlite dnsutils v4l-utils vlc mp3info musl-dev openssl* cargo detox httrack html2text ssmtp sudo -y
+#sudo apt-get install git fail2ban inotify-tools curl net-tools libsodium* python3-dev python3-pip python3-setuptools python3-wheel python3-dotenv mpack libssl-dev libffi-dev -y
+for i in git fail2ban inotify-tools curl net-tools libsodium* python3-dev python3-pip python3-setuptools python3-wheel python3-dotenv mpack libssl-dev libffi-dev; do
+    if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+        sudo apt install -y $i
+    fi
+done
+
+#sudo apt-get install build-essential qrencode jq bc gawk ffmpeg sqlite dnsutils v4l-utils vlc mp3info musl-dev openssl* cargo detox httrack html2text ssmtp sudo -y
+for i in build-essential qrencode jq bc gawk ffmpeg sqlite dnsutils v4l-utils vlc mp3info musl-dev openssl* cargo detox httrack html2text ssmtp sudo; do
+    if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+        sudo apt install -y $i
+    fi
+done
+
 [[ ! $(which kodi) && "$USER" != "xbian" ]] && sudo apt-get install kodi -y
 sudo apt-get install python3-opencv -y ## INSTALLATION IA par reconnaissance d'images
 [[ "$USER" != "xbian" ]] && sudo apt-get install x11-utils xclip zenity handbrake* -y
 if [[ ! $(which apache2) ]]; then
     ########################################################################
     ## INSTALL nginx + php + mariadb + ...
-    sudo apt-get install mariadb-server nginx python3-certbot-nginx certbot ssl-cert php-imap php-cli php-curl php-sqlite3 php-gd php-json php-xml php-mbstring php-gettext php-mysql php-fpm -y
+    # sudo apt-get install mariadb-server nginx python3-certbot-nginx certbot ssl-cert php-imap php-cli php-curl php-sqlite3 php-gd php-json php-xml php-mbstring php-gettext php-mysql php-fpm -y
+    for i in mariadb-server nginx python3-certbot-nginx certbot ssl-cert php-imap php-cli php-curl php-sqlite3 php-gd php-json php-xml php-mbstring php-gettext php-mysql php-fpm; do
+        if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+            sudo apt install -y $i
+        fi
+    done
     #######################################################################
     ## CREATE symlinks for ~/.zen/www/swarm & me
     mkdir -p ~/.zen/astrXbian/www/boris