install glucose like all binaries

install.sh

@@ -110,34 +110,27 @@ else
 fi
 
 ### Glucose
-if hash glucose 2>/dev/null && [[ ! "$(glucose --version 2>/dev/null)" == *4.0* ]]
+if hash glucose 2>/dev/null && [[ ! "$(glucose --version 2>/dev/null)" == *4.* ]]
 then
+  echo "Removing old glucose version"
+  echo "(at least make sure it does not hide a more recent one)"
   rm -i $(which glucose)
 fi
-glucose_url=http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup-4.1.tgz
-glucose_archive=${glucose_url##*/}
-glucose_dir=${glucose_archive%%.tgz}
-pushd modules/glucose/
-# we need sources even if glucose is already installed
-if [[ ! -d glucose-syrup ]]
+if ! hash glucose 2>/dev/null || [[ "$(glucose --version 2>/dev/null)" != *4.* ]]
 then
-  if [[ ! -d $glucose_archive ]]
+  glucose_url=http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup-4.1.tgz
+  glucose_archive=${glucose_url##*/}
+  glucose_dir=${glucose_archive%%.tgz}
+  if [[ ! -r $glucose_archive ]]
   then
     curl -fsSLO $glucose_url
   fi
   tar -xf $glucose_archive
-  rm -Rf $glucose_archive
-  mv $glucose_dir glucose-syrup
-fi
-if ! hash glucose 2>/dev/null || [[ ! "$(glucose --version 2>/dev/null)" == *4.0* ]]
-then
-  pushd glucose-syrup/simp
+  pushd $glucose_dir/simp
   make
   sudo cp glucose /usr/local/bin/glucose
   popd
 fi
-# keep glucose sources, used for module/glucose!
-popd
 
 # Does not work on MacOS?
 ### QMaxSat solver