From: Colin Clark <colin.clark@cclark.uk>
Date: Fri, 9 Aug 2019 09:49:54 +0000 (+0100)
Subject: Remove ZoneDetect from installation script
X-Git-Tag: v1.6~149
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=1cceac2408b3460182e381c562bdc89a34661363

Remove ZoneDetect from installation script

The timezone database can now be loaded from Preferences/General
---

diff --git a/web/geeqie-install-debian.sh b/web/geeqie-install-debian.sh
index 3c45d646..adff056b 100755
--- a/web/geeqie-install-debian.sh
+++ b/web/geeqie-install-debian.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-version="2019-07-22"
+version="2019-08-09"
 description=$'
 Geeqie is an image viewer.
 This script will download, compile, and install Geeqie on Debian-based systems.
@@ -710,22 +710,6 @@ echo "#Installing Geeqie..." > $zen_pipe
 
 sudo --askpass make install >>$install_log 2>&1
 
-# This is a temporary fix until the ZoneDetect project releases its source code
-zonedetect_message="ZoneDetect database not loaded"
-if [[ -d "/usr/local/lib/geeqie" ]]
-then
-	if [[ ! -f "/usr/local/lib/geeqie/timezone21.bin" ]]
-	then
-		sudo --askpass wget --directory-prefix=/usr/local/lib/geeqie/ https://github.com/BertoldVdb/ZoneDetect/raw/master/database/timezone21.bin >>$install_log 2>&1
-		if [[ $? == 0 ]]
-		then
-			zonedetect_message=""
-		fi
-	else
-		zonedetect_message=""
-	fi
-fi
-
 rm $install_pass_script
 mv -f $install_log install.log;