Skip to content

Commit

Permalink
Replace all references to yum with dnf.
Browse files Browse the repository at this point in the history
  • Loading branch information
TrevorBenson committed May 22, 2024
1 parent 4eb2bef commit 3ba47ec
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions scripts/cnode-helper-scripts/cncli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -568,8 +568,8 @@ deployMonitoringAgent() {
echo -e "Installing socat .."
if command -v apt-get >/dev/null; then
sudo apt-get -y install socat >/dev/null || err_exit "'sudo apt-get -y install socat' failed!"
elif command -v yum >/dev/null; then
sudo yum -y install socat >/dev/null || err_exit "'sudo yum -y install socat' failed!"
elif command -v dnf >/dev/null; then
sudo dnf -y install socat >/dev/null || err_exit "'sudo dnf -y install socat' failed!"
else
err_exit "'socat' not found in \$PATH, needed to for node exporter monitoring!"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/cnode-helper-scripts/env
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ checkUserVariables() {
# : $1 = executable to validate
cmdAvailable() {
if ! command -v "$1" &>/dev/null; then
printf "${FG_RED}ERROR${NC}: need '$1' (command not found)\nplease install with your packet manager of choice(apt/yum etc..) and relaunch CNTools\nhttps://command-not-found.com/$1" 1>&2
printf "${FG_RED}ERROR${NC}: need '$1' (command not found)\nplease install with your packet manager of choice(apt/dnf etc..) and relaunch CNTools\nhttps://command-not-found.com/$1" 1>&2
return 1
fi
return 0
Expand Down
4 changes: 2 additions & 2 deletions scripts/cnode-helper-scripts/guild-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ updateWithCustomConfig() {
add_epel_repository() {
if [[ "${1}" =~ Fedora ]]; then return; fi
echo -e "\n Enabling epel repository..."
! grep -q ^epel <<< "$(yum repolist)" && $sudo yum ${3} install https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${2}".noarch.rpm > /dev/null
! grep -q ^epel <<< "$(dnf repolist)" && $sudo dnf ${3} install https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${2}".noarch.rpm > /dev/null
}

# OS Dependencies
Expand All @@ -209,7 +209,7 @@ os_dependencies() {
pkg_list="python3 pkg-config libssl-dev ${libncurses_pkg} libtinfo-dev systemd libsystemd-dev libsodium-dev tmux git jq libtool bc gnupg aptitude libtool secure-delete iproute2 tcptraceroute sqlite3 bsdmainutils libusb-1.0-0-dev libudev-dev unzip llvm clang libnuma-dev libpq-dev build-essential libffi-dev libgmp-dev zlib1g-dev make g++ autoconf automake liblmdb-dev procps xxd"
elif [[ "${OS_ID}" =~ rhel ]] || [[ "${OS_ID}" =~ fedora ]] || [[ "${DISTRO}" =~ Fedora ]]; then
#CentOS/RHEL/Fedora/RockyLinux
pkgmgrcmd="yum"
pkgmgrcmd="dnf"
pkg_list="python3 coreutils ncurses-devel ncurses-libs openssl-devel systemd systemd-devel libsodium-devel tmux git jq gnupg2 libtool iproute bc traceroute sqlite util-linux xz wget unzip procps-ng llvm clang numactl-devel libffi-devel gmp-devel zlib-devel make gcc-c++ autoconf udev lmdb-devel xxd"
if [[ "${VERSION_ID}" == "2" ]] ; then
#AmazonLinux2
Expand Down
8 changes: 4 additions & 4 deletions scripts/grest-helper-scripts/setup-grest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ SGVERSION=v1.1.2
if command -v apt-get >/dev/null; then
sudo apt-get -y install libpcre3-dev >/dev/null || err_exit "'sudo apt-get -y install libpcre3-dev' failed!"
fi
if command -v yum >/dev/null; then
sudo yum -y install pcre-devel >/dev/null || err_exit "'sudo yum -y install prce-devel' failed!"
if command -v dnf >/dev/null; then
sudo dnf -y install pcre-devel >/dev/null || err_exit "'sudo dnf -y install prce-devel' failed!"
fi
cd haproxy-${major_v}.${minor_v} || return
make clean >/dev/null
Expand All @@ -327,8 +327,8 @@ SGVERSION=v1.1.2
printf "\nInstalling socat .."
if command -v apt-get >/dev/null; then
sudo apt-get -y install socat >/dev/null || err_exit "'sudo apt-get -y install socat' failed!"
elif command -v yum >/dev/null; then
sudo yum -y install socat >/dev/null || err_exit "'sudo yum -y install socat' failed!"
elif command -v dnf >/dev/null; then
sudo dnf -y install socat >/dev/null || err_exit "'sudo dnf -y install socat' failed!"
else
err_exit "'socat' not found in \$PATH, needed to for node exporter monitoring!"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/jormu-helper-scripts/prtg_nodestats.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Checklist:
# - If you're not sure of how to make use of this script and setup yourself to PRTG monitor, check in Private Testnet group.
# - Ensure jq is installed via Package Manager of your OS (eg: sudo yum install jq).
# - Ensure jq is installed via Package Manager of your OS (eg: sudo dnf install jq).
# - The comment on the last line "| python -m json.tool" is just present for easy human readability, and needs python to be pre-installed on the system.
# - The script uses sudo to execute netstat commands. Replace as necessary on your local system.
# - Ensure jcli is in the $PATH and accessible for the user thats running httpd/busybox.
Expand Down

0 comments on commit 3ba47ec

Please sign in to comment.