Skip to content

Commit 7847c4f

Browse files
committed
update lib
1 parent 33c98de commit 7847c4f

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

libraries/util.bash

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ function convertISO8601ToSeconds()
124124
if [[ "$(isMacOperatingSystem)" = 'true' ]]
125125
then
126126
date -j -u -f '%FT%T' "$(awk -F '.' '{ print $1 }' <<< "${time}" | tr -d 'Z')" +'%s'
127-
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isUbuntuDistributor)" = 'true' ]]
127+
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isRockyLinuxDistributor)" = 'true' || "$(isUbuntuDistributor)" = 'true' ]]
128128
then
129129
date -d "${time}" +'%s'
130130
else
@@ -651,7 +651,7 @@ function symlinkUsrBin()
651651
else
652652
fatal "\nFATAL : '${sourceBinFileOrFolder}' is not directory or file"
653653
fi
654-
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isUbuntuDistributor)" = 'true' ]]
654+
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isRockyLinuxDistributor)" = 'true' || "$(isUbuntuDistributor)" = 'true' ]]
655655
then
656656
mkdir -p '/usr/bin'
657657

@@ -1030,7 +1030,7 @@ function isPositiveInteger()
10301030

10311031
function checkRequireLinuxSystem()
10321032
{
1033-
if [[ "$(isAmazonLinuxDistributor)" = 'false' && "$(isCentOSDistributor)" = 'false' && "$(isRedHatDistributor)" = 'false' && "$(isUbuntuDistributor)" = 'false' ]]
1033+
if [[ "$(isAmazonLinuxDistributor)" = 'false' && "$(isCentOSDistributor)" = 'false' && "$(isRedHatDistributor)" = 'false' && "$(isRockyLinuxDistributor)" = 'false' && "$(isUbuntuDistributor)" = 'false' ]]
10341034
then
10351035
fatal '\nFATAL : only support Amazon-Linux, CentOS, RedHat, or Ubuntu OS'
10361036
fi
@@ -1141,6 +1141,11 @@ function isRedHatDistributor()
11411141
isDistributor 'redhat'
11421142
}
11431143

1144+
function isRockyLinuxDistributor()
1145+
{
1146+
isDistributor 'rockylinux'
1147+
}
1148+
11441149
function isUbuntuDistributor()
11451150
{
11461151
isDistributor 'ubuntu'
@@ -1166,9 +1171,9 @@ function installBuildEssential()
11661171
if [[ "$(isUbuntuDistributor)" = 'true' ]]
11671172
then
11681173
installPackages 'g++' 'build-essential'
1169-
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' ]]
1174+
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isRockyLinuxDistributor)" = 'true' ]]
11701175
then
1171-
installPackages 'gcc' 'gcc-c++' 'kernel-devel' 'make'
1176+
installPackages 'gcc' 'gcc-c++' 'kernel-devel' 'make' 'openssl-devel'
11721177
else
11731178
fatal '\nFATAL : only support Amazon-Linux, CentOS, RedHat, or Ubuntu OS'
11741179
fi
@@ -1190,7 +1195,7 @@ function installCleanUp()
11901195
DEBIAN_FRONTEND='noninteractive' apt-get --fix-missing -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' autoremove
11911196
DEBIAN_FRONTEND='noninteractive' apt-get --fix-missing -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' clean
11921197
DEBIAN_FRONTEND='noninteractive' apt-get --fix-missing -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' autoclean
1193-
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' ]]
1198+
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isRockyLinuxDistributor)" = 'true' ]]
11941199
then
11951200
yum clean all
11961201
else
@@ -1249,7 +1254,7 @@ function installPackage()
12491254
(DEBIAN_FRONTEND='noninteractive' apt-get install --fix-missing --yes -f -y && DEBIAN_FRONTEND='noninteractive' apt-get install "${aptPackage}" --fix-missing -y)
12501255
fi
12511256
fi
1252-
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' ]]
1257+
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isRockyLinuxDistributor)" = 'true' ]]
12531258
then
12541259
if [[ "$(isEmptyString "${rpmPackage}")" = 'false' ]]
12551260
then
@@ -1276,7 +1281,7 @@ function installPackages()
12761281
if [[ "$(isUbuntuDistributor)" = 'true' ]]
12771282
then
12781283
installPackage "${package}"
1279-
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' ]]
1284+
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isRockyLinuxDistributor)" = 'true' ]]
12801285
then
12811286
installPackage '' "${package}"
12821287
else
@@ -1399,7 +1404,7 @@ function runUpgrade()
13991404

14001405
info '\napt-get autoclean'
14011406
DEBIAN_FRONTEND='noninteractive' apt-get --fix-missing -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' autoclean
1402-
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' ]]
1407+
elif [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isCentOSDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isRockyLinuxDistributor)" = 'true' ]]
14031408
then
14041409
yum -y --security update
14051410
yum -y update --nogpgcheck --skip-broken
@@ -2095,7 +2100,7 @@ function isPortOpen()
20952100

20962101
checkNonEmptyString "${port}" 'undefined port'
20972102

2098-
if [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isUbuntuDistributor)" = 'true' ]]
2103+
if [[ "$(isAmazonLinuxDistributor)" = 'true' || "$(isRedHatDistributor)" = 'true' || "$(isRockyLinuxDistributor)" = 'true' || "$(isUbuntuDistributor)" = 'true' ]]
20992104
then
21002105
local -r process="$(netstat -l -n -t -u | grep -E ":${port}\s+" | head -1)"
21012106
elif [[ "$(isCentOSDistributor)" = 'true' || "$(isMacOperatingSystem)" = 'true' ]]

0 commit comments

Comments
 (0)