fix: [installer] Variable regression (#4829)

fix: [installer] Variable regression

INSTALL/INSTALL.sh

@@ -260,7 +260,7 @@ checkCoreOS () {
 
 # Extract debian flavour
 checkFlavour () {
-  lsb_dist=""
+  FLAVOUR=""
   # Every system that we officially support has /etc/os-release
   if [ -r /etc/os-release ]; then
     FLAVOUR="$(. /etc/os-release && echo "$ID"| tr '[:upper:]' '[:lower:]')"
@@ -290,14 +290,14 @@ checkFlavour () {
       if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
         dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
       fi
-      echo "$lsb_dist not supported at the moment"
+      echo "$FLAVOUR not supported at the moment"
       exit 1
     ;;
     rhel|ol|sles)
       if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
         dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
       fi
-      echo "$lsb_dist not supported at the moment"
+      echo "$FLAVOUR not supported at the moment"
       exit 1
     ;;
     *)
@@ -334,20 +334,20 @@ check_forked () {
     if [ "$lsb_release_exit_code" = "0" ]; then
       # Print info about current distro
       cat <<-EOF
-      You're using '$lsb_dist' version '$dist_version'.
+      You're using '$FLAVOUR' version '$dist_version'.
 EOF
       # Get the upstream release info
-      lsb_dist=$(lsb_release -a -u 2>&1 | tr '[:upper:]' '[:lower:]' | grep -E 'id' | cut -d ':' -f 2 | tr -d '[:space:]')
+      FLAVOUR=$(lsb_release -a -u 2>&1 | tr '[:upper:]' '[:lower:]' | grep -E 'id' | cut -d ':' -f 2 | tr -d '[:space:]')
       dist_version=$(lsb_release -a -u 2>&1 | tr '[:upper:]' '[:lower:]' | grep -E 'codename' | cut -d ':' -f 2 | tr -d '[:space:]')
 
       # Print info about upstream distro
       cat <<-EOF
-      Upstream release is '$lsb_dist' version '$dist_version'.
+      Upstream release is '$FLAVOUR' version '$dist_version'.
 EOF
     else
-      if [ -r /etc/debian_version ] && [ "$lsb_dist" != "ubuntu" ] && [ "$lsb_dist" != "raspbian" ]; then
+      if [ -r /etc/debian_version ] && [ "$FLAVOUR" != "ubuntu" ] && [ "$FLAVOUR" != "raspbian" ]; then
         # We're Debian and don't even know it!
-        lsb_dist=debian
+        FLAVOUR=debian
         dist_version="$(sed 's/\/.*//' /etc/debian_version | sed 's/\..*//')"
         case "$dist_version" in
           10)
@@ -2480,7 +2480,7 @@ armv7l-ubuntu-bionic
 "
 
 # Check if we actually support this configuration
-if ! echo "$SUPPORT_MAP" | grep "$(uname -m)-$lsb_dist-$dist_version" >/dev/null; then
+if ! echo "$SUPPORT_MAP" | grep "$(uname -m)-$FLAVOUR-$dist_version" >/dev/null; then
   cat >&2 <<-'EOF'
     Either your platform is not easily detectable or is not supported by this
     installer script.

INSTALL/INSTALL.sh.sfv

@@ -1,5 +1,5 @@
-; Generated by RHash v1.3.8 on 2019-07-02 at 11:32.43
+; Generated by RHash v1.3.8 on 2019-07-02 at 12:28.32
 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
 ;
-;        99486  11:32.43 2019-07-02 INSTALL.sh
-INSTALL.sh 9CF5E9CD8F7AE5D3A558ECD3C8B21718D4733FC6 5A47A2545E36D2933F284B7CE0A90B88109A11DD50A4CD994B5EEBDA6C895484 69565AA17784FBE0D148D391B8412751B5CBF68763C0F430BB3776E7D0E591E74585FC6D48701EE38946B6C798D1C21F 760D264E464A9EB3C51A9BE32965567F1277E64DF7A7AFE0BC9A3D239741EAAF819A282765F5F8918348DE588EABCCB6F87A4966D60906F624A767ACA003645B
+;        99476  12:28.32 2019-07-02 INSTALL.sh
+INSTALL.sh 064C49340280B33DA2078761BB649794D8E31F6C 86BA12B0F85366B89106C901341C43D39ABB4F1EF546143D40EE44CD7DA578F7 AAE62AA039BA822CD39A5937DCBD22F0AC991802DED6F94A0F9754BE87CA091E9EAF457C5AB1831E6C583F4F0B286BE3 D77A1290A34453EFCCA50970FED5BC7035C49652E35EDC4108D82A7C4BA3CF1F020B41D36DD2E80AA9A557CF3F176F370CFC797130E9956C859E48AC272832E8

INSTALL/INSTALL.sh.sha1

@@ -1 +1 @@
-9cf5e9cd8f7ae5d3a558ecd3c8b21718d4733fc6  INSTALL.sh
+064c49340280b33da2078761bb649794d8e31f6c  INSTALL.sh

INSTALL/INSTALL.sh.sha256

@@ -1 +1 @@
-5a47a2545e36d2933f284b7ce0a90b88109a11dd50a4cd994b5eebda6c895484  INSTALL.sh
+86ba12b0f85366b89106c901341c43d39abb4f1ef546143d40ee44cd7da578f7  INSTALL.sh

INSTALL/INSTALL.sh.sha384

@@ -1 +1 @@
-69565aa17784fbe0d148d391b8412751b5cbf68763c0f430bb3776e7d0e591e74585fc6d48701ee38946b6c798d1c21f  INSTALL.sh
+aae62aa039ba822cd39a5937dcbd22f0ac991802ded6f94a0f9754be87ca091e9eaf457c5ab1831e6c583f4f0b286be3  INSTALL.sh

INSTALL/INSTALL.sh.sha512

@@ -1 +1 @@
-760d264e464a9eb3c51a9be32965567f1277e64df7a7afe0bc9a3d239741eaaf819a282765f5f8918348de588eabccb6f87a4966d60906f624a767aca003645b  INSTALL.sh
+d77a1290a34453efcca50970fed5bc7035c49652e35edc4108d82a7c4ba3cf1f020b41d36dd2e80aa9a557cf3f176f370cfc797130e9956c859e48ac272832e8  INSTALL.sh

INSTALL/INSTALL.tpl.sh

@@ -686,7 +686,7 @@ armv7l-ubuntu-bionic
 "
 
 # Check if we actually support this configuration
-if ! echo "$SUPPORT_MAP" | grep "$(uname -m)-$lsb_dist-$dist_version" >/dev/null; then
+if ! echo "$SUPPORT_MAP" | grep "$(uname -m)-$FLAVOUR-$dist_version" >/dev/null; then
   cat >&2 <<-'EOF'
     Either your platform is not easily detectable or is not supported by this
     installer script.

docs/generic/supportFunctions.md

@@ -106,7 +106,7 @@ checkCoreOS () {
 
 # Extract debian flavour
 checkFlavour () {
-  lsb_dist=""
+  FLAVOUR=""
   # Every system that we officially support has /etc/os-release
   if [ -r /etc/os-release ]; then
     FLAVOUR="$(. /etc/os-release && echo "$ID"| tr '[:upper:]' '[:lower:]')"
@@ -136,14 +136,14 @@ checkFlavour () {
       if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
         dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
       fi
-      echo "$lsb_dist not supported at the moment"
+      echo "$FLAVOUR not supported at the moment"
       exit 1
     ;;
     rhel|ol|sles)
       if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
         dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
       fi
-      echo "$lsb_dist not supported at the moment"
+      echo "$FLAVOUR not supported at the moment"
       exit 1
     ;;
     *)
@@ -180,20 +180,20 @@ check_forked () {
     if [ "$lsb_release_exit_code" = "0" ]; then
       # Print info about current distro
       cat <<-EOF
-      You're using '$lsb_dist' version '$dist_version'.
+      You're using '$FLAVOUR' version '$dist_version'.
 EOF
       # Get the upstream release info
-      lsb_dist=$(lsb_release -a -u 2>&1 | tr '[:upper:]' '[:lower:]' | grep -E 'id' | cut -d ':' -f 2 | tr -d '[:space:]')
+      FLAVOUR=$(lsb_release -a -u 2>&1 | tr '[:upper:]' '[:lower:]' | grep -E 'id' | cut -d ':' -f 2 | tr -d '[:space:]')
       dist_version=$(lsb_release -a -u 2>&1 | tr '[:upper:]' '[:lower:]' | grep -E 'codename' | cut -d ':' -f 2 | tr -d '[:space:]')
 
       # Print info about upstream distro
       cat <<-EOF
-      Upstream release is '$lsb_dist' version '$dist_version'.
+      Upstream release is '$FLAVOUR' version '$dist_version'.
 EOF
     else
-      if [ -r /etc/debian_version ] && [ "$lsb_dist" != "ubuntu" ] && [ "$lsb_dist" != "raspbian" ]; then
+      if [ -r /etc/debian_version ] && [ "$FLAVOUR" != "ubuntu" ] && [ "$FLAVOUR" != "raspbian" ]; then
         # We're Debian and don't even know it!
-        lsb_dist=debian
+        FLAVOUR=debian
         dist_version="$(sed 's/\/.*//' /etc/debian_version | sed 's/\..*//')"
         case "$dist_version" in
           10)