Skip to content

Detect major version correctly #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenhys merged 2 commits into from
Dec 22, 2025
Merged

Detect major version correctly #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4105bc
Detect major version correctly
kenhys Dec 22, 2025
c4f23f6
Regenerate install scripts
kenhys Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions make-install-script.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sh/install-amazon2023-fluent-package6-lts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sh/install-amazon2023-fluent-package6.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sh/install-redhat-fluent-package6-lts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sh/install-redhat-fluent-package6.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down