From 35bec1405fce9c298b3b3ad836f09c09b9be7787 Mon Sep 17 00:00:00 2001
From: Djan GICQUEL <>
Date: Fri, 13 May 2022 22:06:19 +0200
Subject: [PATCH] updated to syncthing v1.20.1 (amd64) archiveurl is now a
 regex

---
 syncthing-install-auto-serveur.sh |  4 ++--
 syncthing-install-auto.sh         | 24 +++++++-----------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/syncthing-install-auto-serveur.sh b/syncthing-install-auto-serveur.sh
index 5ed176b..9bb5222 100644
--- a/syncthing-install-auto-serveur.sh
+++ b/syncthing-install-auto-serveur.sh
@@ -6,8 +6,8 @@
 
 # Variables partagées
 # releases url : https://github.com/syncthing/syncthing/releases/
-archive_url="https://github.com/syncthing/syncthing/releases/download/v1.19.0/syncthing-dragonfly-amd64-v1.19.0.tar.gz"
-archivename="syncthing-linux-amd64-v1.19.0.tar.gz"
+archive_url="https://github.com/syncthing/syncthing/releases/download/v1.20.1/syncthing-linux-amd64-v1.20.1.tar.gz"
+archivename=$(echo $archive_url | grep -oE 'syncthing-(.*)\.tar\.gz')
 iconurl="https://raw.githubusercontent.com/syncthing/syncthing/main/assets/logo-128.png"
 
 #Chemin sans slash de fin. Un dossier "syncthing" sera créé dans ce dossier
diff --git a/syncthing-install-auto.sh b/syncthing-install-auto.sh
index b6ab630..75bff7c 100644
--- a/syncthing-install-auto.sh
+++ b/syncthing-install-auto.sh
@@ -6,8 +6,8 @@
 
 # Variables partagées
 # releases url : https://github.com/syncthing/syncthing/releases/
-archive_url="https://github.com/syncthing/syncthing/releases/download/v1.19.0/syncthing-dragonfly-amd64-v1.19.0.tar.gz"
-archivename="syncthing-linux-amd64-v1.19.0.tar.gz"
+archive_url="https://github.com/syncthing/syncthing/releases/download/v1.20.1/syncthing-linux-amd64-v1.20.1.tar.gz"
+archivename=$(echo $archive_url | grep -oE 'syncthing-(.*)\.tar\.gz')
 iconurl="https://raw.githubusercontent.com/syncthing/syncthing/main/assets/logo-128.png"
 
 # Fonctions partagées
@@ -17,16 +17,6 @@ if [ "$?" != "0" ]; then
 echo "Erreur la connexion internet semble défaillante"
 echo "Fin du script."
 exit
-else
-echo "La connexion internet est fonctionnelle"
-echo ""
-fi
-}
-
-fonct_CreationDossier () {
-if [ ! -d "$1" ]; then
-mkdir -p "$1"
-echo "Le dossier $1 a été créé."
 fi
 }
 
@@ -104,13 +94,13 @@ echo ""
 
 fonct_TouchePourContinuer
 clear
-fonct_CreationDossier $HOME/bin/
-fonct_CreationDossier $HOME/.icons/
-fonct_CreationDossier $HOME/.config/autostart/
+mkdir -p $HOME/bin/ || echo "Error, mkdir bin failed"exit 
+mkdir -p $HOME/.icons/ || echo "Error, mkdir icons failed";exit
+mkdir -p $HOME/.config/autostart/ || echo "Error, mkdir autostart failed";exit
 
 # Téléchargement syncthing
-wget --quiet $archive_url
-tar -xzf $archivename -C $HOME/bin/
+wget --quiet $archive_url || echo "Error, downloading archive";exit
+tar -xzf $archivename -C $HOME/bin/ || echo "Error, untar archive failed";exit
 mv $HOME/bin/syncthing* $HOME/bin/syncthing
 rm $archivename
 echo ""