diff --git a/make-install-script.erb b/make-install-script.erb index 822cac3..d5be14f 100644 --- a/make-install-script.erb +++ b/make-install-script.erb @@ -13,7 +13,7 @@ sudo sh <<'SCRIPT' <% if install_info[:channel_version] >= 6 %> # add fluent-release to access repository distribution=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f2) - version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4) + version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4 | cut -d. -f1) arch=$(rpm --eval %{_arch}) <% if install_info[:lts] %> curl --silent -o fluent-release.rpm <%= install_info[:base_url] %>/lts/<%= install_info[:channel_version]%>/redhat/${version}/${arch}/fluent-lts-release-<%= install_info[:fluent_release_version] %>.el${version}.noarch.rpm @@ -92,7 +92,7 @@ sudo sh <<'SCRIPT' <% if install_info[:channel_version] >= 6 %> # add fluent-release to access repository - version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4) + version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4 | cut -d. -f1) arch=$(rpm --eval %{_arch}) <% if install_info[:lts] %> curl -o fluent-release.rpm <%= install_info[:base_url] %>/lts/<%= install_info[:channel_version]%>/amazon/${version}/${arch}/fluent-lts-release-<%= install_info[:fluent_release_version] %>.amzn${version}.noarch.rpm diff --git a/sh/install-amazon2023-fluent-package6-lts.sh b/sh/install-amazon2023-fluent-package6-lts.sh index d2514db..f522704 100644 --- a/sh/install-amazon2023-fluent-package6-lts.sh +++ b/sh/install-amazon2023-fluent-package6-lts.sh @@ -11,7 +11,7 @@ sudo -k sudo sh <<'SCRIPT' # add fluent-release to access repository - version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4) + version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4 | cut -d. -f1) arch=$(rpm --eval %{_arch}) curl -o fluent-release.rpm https://fluentd.cdn.cncf.io/lts/6/amazon/${version}/${arch}/fluent-lts-release-2025.9.29-1.amzn${version}.noarch.rpm if [ -e /etc/yum.repos.d/fluent-package-lts.repo ]; then diff --git a/sh/install-amazon2023-fluent-package6.sh b/sh/install-amazon2023-fluent-package6.sh index 5856cae..df4a9d6 100644 --- a/sh/install-amazon2023-fluent-package6.sh +++ b/sh/install-amazon2023-fluent-package6.sh @@ -11,7 +11,7 @@ sudo -k sudo sh <<'SCRIPT' # add fluent-release to access repository - version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4) + version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4 | cut -d. -f1) arch=$(rpm --eval %{_arch}) curl -o fluent-release.rpm https://fluentd.cdn.cncf.io/6/amazon/${version}/${arch}/fluent-release-2025.9.29-1.amzn${version}.noarch.rpm if [ -e /etc/yum.repos.d/fluent-package.repo ]; then diff --git a/sh/install-redhat-fluent-package6-lts.sh b/sh/install-redhat-fluent-package6-lts.sh index 0b20621..773739a 100644 --- a/sh/install-redhat-fluent-package6-lts.sh +++ b/sh/install-redhat-fluent-package6-lts.sh @@ -11,7 +11,7 @@ sudo -k sudo sh <<'SCRIPT' # add fluent-release to access repository distribution=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f2) - version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4) + version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4 | cut -d. -f1) arch=$(rpm --eval %{_arch}) curl --silent -o fluent-release.rpm https://fluentd.cdn.cncf.io/lts/6/redhat/${version}/${arch}/fluent-lts-release-2025.9.29-1.el${version}.noarch.rpm if [ -e /etc/yum.repos.d/fluent-package-lts.repo ]; then diff --git a/sh/install-redhat-fluent-package6.sh b/sh/install-redhat-fluent-package6.sh index 1d7e201..fb02aa6 100644 --- a/sh/install-redhat-fluent-package6.sh +++ b/sh/install-redhat-fluent-package6.sh @@ -11,7 +11,7 @@ sudo -k sudo sh <<'SCRIPT' # add fluent-release to access repository distribution=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f2) - version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4) + version=$(cat /etc/system-release-cpe | awk '{print substr($1, index($1, "o"))}' | cut -d: -f4 | cut -d. -f1) arch=$(rpm --eval %{_arch}) curl --silent -o fluent-release.rpm https://fluentd.cdn.cncf.io/6/redhat/${version}/${arch}/fluent-release-2025.9.29-1.el${version}.noarch.rpm if [ -e /etc/yum.repos.d/fluent-package.repo ]; then