fix km4ack#447

Author: km4ack

functions/additional.function

@@ -510,27 +510,29 @@ EOF
 	sudo mv qsstv.desktop /usr/share/applications/
 
 }
+
 ##################################
 #	GRIDTRACKER
 ##################################
 GRIDTRACKER() {
+	#due to constant changes to GT website, get the download link from a file on KM4ACK github.
+	cd /run/user/$UID/
+	wget https://raw.githubusercontent.com/km4ack/pi-scripts/master/gt-download-links	
 	cd ${HOME} || return
 	sudo apt-get install -y libgconf-2-4
+
 	#determine if 32/64 bit and set download link accordingly. issue #382
 	if [ `getconf LONG_BIT` = '32' ]; then
-	#GRIDDLL=$(curl -s https://download.gridtracker.org/latest_release.html | grep arm32 | sed 's/.*href="//;s/">.*//')
-	GRIDDLL=$(curl -s https://storage.googleapis.com/gt_download/ | awk 'BEGIN{FS="<Key>"; OFS="\n<Key>"} {$1=$1} 1' | grep arm32 | sed '/<Key>nwjs/d;/<Key>test/d' | head -1 | sed 's/<Key>//;s/<\/Key>.*//')	
-	GT_DIR=$(echo $GRIDDLL | sed 's|/.*||')
-	GRIDDLL=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/')
+	GRIDDLL=$(cat /run/user/$UID/gt-download-links | grep arm32 | sed 's/arm32=//')
+	GT_TAR_NAME=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/')
+
 	else
-	#GRIDDLL=$(curl -s https://download.gridtracker.org/latest_release.html | grep arm64 | sed 's/.*href="//;s/">.*//')
-	GRIDDLL=$(curl -s https://storage.googleapis.com/gt_download/ | awk 'BEGIN{FS="<Key>"; OFS="\n<Key>"} {$1=$1} 1' | grep arm32 | sed '/<Key>nwjs/d;/<Key>test/d' | head -1 | sed 's/<Key>//;s/<\/Key>.*//')
-	GT_DIR=$(echo $GRIDDLL | sed 's|/.*||')
-	GRIDDLL=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/')
+	GRIDDLL=$(cat /run/user/$UID/gt-download-links | grep arm64 | sed 's/arm64=//')
+	GT_TAR_NAME=$(echo $GRIDDLL | sed 's/.*GridTracker/GridTracker/')
 	fi
-	wget --tries 2 --connect-timeout=60 https://storage.googleapis.com/gt_download/$GT_DIR/$GRIDDLL
-	GRIDTAR=$(echo $GRIDDLL | sed 's/.*\///g')
-	tar -xzvf $GRIDTAR
+
+	wget --tries 2 --connect-timeout=60 $GRIDDLL
+	tar -xzvf $GT_TAR_NAME
 	rm GridTracker*.gz
 	#determine if 32/64 bit and get correct directory name.
 	if [ `getconf LONG_BIT` = '32' ]; then
@@ -539,6 +541,8 @@ GRIDTRACKER() {
 	OLDFOLDER=$(ls | grep GridTracker*-linux-arm64)
 	fi
 	mv "$OLDFOLDER" $HOME/GridTracker
+
+
 	cat >gridtracker.desktop <<EOF
 [Desktop Entry]
 Name=GridTracker
@@ -558,6 +562,7 @@ EOF
 
 }
 
+
 ##################################
 #	PROPAGATION
 ##################################