From 7bd5828f7c24ed082d273ecc2c47c531ff7ac042 Mon Sep 17 00:00:00 2001
From: clamsawd <clamsawd@openmailbox.org>
Date: Mon, 26 Oct 2015 16:39:27 +0100
Subject: [PATCH] Fixed errors with new URLs (http://archive.mozilla.org)

---
 scripts/firefox-install     | 10 +++++-----
 scripts/thunderbird-install | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/firefox-install b/scripts/firefox-install
index f613258..c710bf9 100755
--- a/scripts/firefox-install
+++ b/scripts/firefox-install
@@ -2,9 +2,9 @@
  
 # Script to install Firefox on GNU/Linux
 # Created by clamsawd (clamsawd@openmailbox.org)
-# Version 2.1
+# Version 2.2
 # Licensed by GPL v.2
-# Last update: 14-10-2015
+# Last update: 26-10-2015
 # --------------------------------------
 
 # Check if 'user' is 'root'
@@ -441,9 +441,9 @@ function check_other_installs_on_system(){
    TMP_FILE_BETA=/tmp/moz_versions_bt
    TMP_FILE_ESR=/tmp/moz_versions_esr
    HTTP_FIREFOX=http://archive.mozilla.org/pub/firefox/releases
-      curl "$HTTP_FIREFOX/latest/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 3 | cut -d "<" -f 1 > $TMP_FILE_STABLE
-      curl "$HTTP_FIREFOX/latest-beta/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 3 | cut -d "<" -f 1 > $TMP_FILE_BETA
-      curl "$HTTP_FIREFOX/latest-esr/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 3 | cut -d "<" -f 1 > $TMP_FILE_ESR
+      curl "$HTTP_FIREFOX/latest/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 4 | cut -d "<" -f 1 | cut -d '"' -f 1 | tail -n 1 > $TMP_FILE_STABLE
+      curl "$HTTP_FIREFOX/latest-beta/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 5 | cut -d "<" -f 1 | cut -d '"' -f 1 | tail -n 1 > $TMP_FILE_BETA
+      curl "$HTTP_FIREFOX/latest-esr/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 5 | cut -d "<" -f 1 | cut -d '"' -f 1 | tail -n 1 > $TMP_FILE_ESR
        error=$?
        if [ $? -eq 0 ] ; then
          echo "OK" > /dev/null
diff --git a/scripts/thunderbird-install b/scripts/thunderbird-install
index d443a08..7636ab8 100755
--- a/scripts/thunderbird-install
+++ b/scripts/thunderbird-install
@@ -2,9 +2,9 @@
  
 # Script to install Thunderbird on GNU/Linux
 # Created by clamsawd (clamsawd@openmailbox.org)
-# Version 2.1
+# Version 2.2
 # Licensed by GPL v.2
-# Last update: 14-10-2015
+# Last update: 26-10-2015
 # --------------------------------------
 
 # Check if 'user' is 'root'
@@ -441,9 +441,9 @@ function check_other_installs_on_system(){
    TMP_FILE_BETA=/tmp/moz_versions_bt
    TMP_FILE_ESR=/tmp/moz_versions_esr
    HTTP_THUNDERBIRD=http://archive.mozilla.org/pub/thunderbird/releases
-      curl "$HTTP_THUNDERBIRD/latest/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 3 | cut -d "<" -f 1 > $TMP_FILE_STABLE
-      curl "$HTTP_THUNDERBIRD/latest-beta/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 3 | cut -d "<" -f 1 > $TMP_FILE_BETA
-      curl "$HTTP_THUNDERBIRD/latest-esr/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 3 | cut -d "<" -f 1 > $TMP_FILE_ESR
+      curl "$HTTP_THUNDERBIRD/latest/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 4 | cut -d "<" -f 1 | cut -d '"' -f 1 | tail -n 1 > $TMP_FILE_STABLE
+      curl "$HTTP_THUNDERBIRD/latest-beta/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 5 | cut -d "<" -f 1 | cut -d '"' -f 1 | tail -n 1 > $TMP_FILE_BETA
+      curl "$HTTP_THUNDERBIRD/latest-esr/linux-x86_64/en-US/" | grep "tar.bz2" | cut -d "-" -f 5 | cut -d "<" -f 1 | cut -d '"' -f 1 | tail -n 1 > $TMP_FILE_ESR
        error=$?
        if [ $? -eq 0 ] ; then
          echo "OK" > /dev/null