Browse Source

8.4 to just 8

pull/3568/head
Daniel Gibbs 4 years ago
parent
commit
685b2cb71a
  1. 0
      lgsm/data/almalinux-8.csv
  2. 0
      lgsm/data/rhel-7.csv
  3. 0
      lgsm/data/rhel-8.csv
  4. 0
      lgsm/data/rocky-8.csv
  5. 5
      lgsm/functions/check_deps.sh
  6. 3
      lgsm/functions/info_distro.sh

0
lgsm/data/almalinux-8.4.csv → lgsm/data/almalinux-8.csv

Can't render this file because it has a wrong number of fields in line 2.

0
lgsm/data/rhel-7.4.csv → lgsm/data/rhel-7.csv

Can't render this file because it has a wrong number of fields in line 2.

0
lgsm/data/rhel-8.4.csv → lgsm/data/rhel-8.csv

Can't render this file because it has a wrong number of fields in line 2.

0
lgsm/data/rocky-8.4.csv → lgsm/data/rocky-8.csv

Can't render this file because it has a wrong number of fields in line 2.

5
lgsm/functions/check_deps.sh

@ -298,6 +298,11 @@ fi
info_distro.sh
# some RHEL based distros use 8.4 instead of just 8.
if [[ "${distroidlike}" == *"rhel"* ]]||[ "${distroid}" == "rhel" ]; then
distroversion="${distroversionrh}"
fi
if [ ! -f "${tmpdir}/dependency-no-check.tmp" ]&&[ ! -f "${datadir}/${distroid}-${distroversion}.csv" ]; then
# Check that the disto dependency csv file exists.
fn_check_file_github "lgsm/data" "${distroid}-${distroversion}.csv"

3
lgsm/functions/info_distro.sh

@ -35,7 +35,10 @@ for distro_info in "${distro_info_array[@]}"; do
if [ -f "/etc/os-release" ]&&[ "${distro_info}" == "os-release" ]; then
distroname="$(grep "PRETTY_NAME" /etc/os-release | awk -F\= '{gsub(/"/,"",$2);print $2}')"
distroversion="$(grep "VERSION_ID" /etc/os-release | awk -F\= '{gsub(/"/,"",$2);print $2}')"
# Special var for rhel like distros to removed point in number e.g 8.4 to just 8.
distroversionrh="$(printf "%.0f\n" "${distroname}")"
distroid="$(grep "ID=" /etc/os-release | grep -v _ID | awk -F\= '{gsub(/"/,"",$2);print $2}')"
distroidlike="$(grep "ID_LIKE=" /etc/os-release | grep -v _ID | awk -F\= '{gsub(/"/,"",$2);print $2}')"
distrocodename="$(grep "VERSION_CODENAME" /etc/os-release | awk -F\= '{gsub(/"/,"",$2);print $2}')"
elif [ "$(command -v lsb_release 2>/dev/null)" ]&&[ "${distro_info}" == "lsb_release" ]; then
if [ -z "${distroname}" ];then

Loading…
Cancel
Save