xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-08-16 00:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(scripts): avoid rpm package upgrades before installs (#5750)

Browse Source
This commit is contained in:
Vitaliy Pavlov
2026-07-03 02:01:54 +04:00
committed by GitHub
parent 1afab47f04
commit ed95acdd47
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.sh
+3 -3
View File
@@ -101,13 +101,13 @@ install_base() {
apt-get update && apt-get install -y -q cron curl tar tzdata socat ca-certificates openssl apt-get update && apt-get install -y -q cron curl tar tzdata socat ca-certificates openssl
;; ;;
fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol) fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol)
dnf -y update && dnf install -y -q cronie curl tar tzdata socat ca-certificates openssl dnf makecache -y && dnf install -y -q cronie curl tar tzdata socat ca-certificates openssl
;; ;;
centos) centos)
if [[ "${VERSION_ID}" =~ ^7 ]]; then if [[ "${VERSION_ID}" =~ ^7 ]]; then
yum -y update && yum install -y cronie curl tar tzdata socat ca-certificates openssl yum makecache -y && yum install -y cronie curl tar tzdata socat ca-certificates openssl
else else
dnf -y update && dnf install -y -q cronie curl tar tzdata socat ca-certificates openssl dnf makecache -y && dnf install -y -q cronie curl tar tzdata socat ca-certificates openssl
fi fi
;; ;;
arch | manjaro | parch) arch | manjaro | parch)
update.sh
+1 -1
View File
@@ -187,7 +187,7 @@ install_base() {
;; ;;
centos) centos)
if [[ "${VERSION_ID}" =~ ^7 ]]; then if [[ "${VERSION_ID}" =~ ^7 ]]; then
yum -y update > /dev/null 2>&1 && yum install -y -q cronie curl tar tzdata socat openssl > /dev/null 2>&1 yum makecache -y > /dev/null 2>&1 && yum install -y -q cronie curl tar tzdata socat openssl > /dev/null 2>&1
else else
dnf makecache -y > /dev/null 2>&1 && dnf install -y -q cronie curl tar tzdata socat openssl > /dev/null 2>&1 dnf makecache -y > /dev/null 2>&1 && dnf install -y -q cronie curl tar tzdata socat openssl > /dev/null 2>&1
fi fi
x-ui.sh
+9 -9
View File
@@ -1583,13 +1583,13 @@ ssl_cert_issue_for_ip() {
apt-get update > /dev/null 2>&1 && apt-get install socat -y > /dev/null 2>&1 apt-get update > /dev/null 2>&1 && apt-get install socat -y > /dev/null 2>&1
;; ;;
fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol) fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol)
dnf -y update > /dev/null 2>&1 && dnf -y install socat > /dev/null 2>&1 dnf makecache -y > /dev/null 2>&1 && dnf -y install socat > /dev/null 2>&1
;; ;;
centos) centos)
if [[ "${VERSION_ID}" =~ ^7 ]]; then if [[ "${VERSION_ID}" =~ ^7 ]]; then
yum -y update > /dev/null 2>&1 && yum -y install socat > /dev/null 2>&1 yum makecache -y > /dev/null 2>&1 && yum -y install socat > /dev/null 2>&1
else else
dnf -y update > /dev/null 2>&1 && dnf -y install socat > /dev/null 2>&1 dnf makecache -y > /dev/null 2>&1 && dnf -y install socat > /dev/null 2>&1
fi fi
;; ;;
arch | manjaro | parch) arch | manjaro | parch)
@@ -1749,13 +1749,13 @@ ssl_cert_issue() {
apt-get update > /dev/null 2>&1 && apt-get install socat -y > /dev/null 2>&1 apt-get update > /dev/null 2>&1 && apt-get install socat -y > /dev/null 2>&1
;; ;;
fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol) fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol)
dnf -y update > /dev/null 2>&1 && dnf -y install socat > /dev/null 2>&1 dnf makecache -y > /dev/null 2>&1 && dnf -y install socat > /dev/null 2>&1
;; ;;
centos) centos)
if [[ "${VERSION_ID}" =~ ^7 ]]; then if [[ "${VERSION_ID}" =~ ^7 ]]; then
yum -y update > /dev/null 2>&1 && yum -y install socat > /dev/null 2>&1 yum makecache -y > /dev/null 2>&1 && yum -y install socat > /dev/null 2>&1
else else
dnf -y update > /dev/null 2>&1 && dnf -y install socat > /dev/null 2>&1 dnf makecache -y > /dev/null 2>&1 && dnf -y install socat > /dev/null 2>&1
fi fi
;; ;;
arch | manjaro | parch) arch | manjaro | parch)
@@ -2286,14 +2286,14 @@ setup_fail2ban_iplimit() {
apt-get update && apt-get install fail2ban nftables -y apt-get update && apt-get install fail2ban nftables -y
;; ;;
fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol) fedora | amzn | virtuozzo | rhel | almalinux | rocky | ol)
dnf -y update && dnf -y install fail2ban nftables dnf makecache -y && dnf -y install fail2ban nftables
;; ;;
centos) centos)
if [[ "${VERSION_ID}" =~ ^7 ]]; then if [[ "${VERSION_ID}" =~ ^7 ]]; then
yum update -y && yum install epel-release -y yum makecache -y && yum install epel-release -y
yum -y install fail2ban nftables yum -y install fail2ban nftables
else else
dnf -y update && dnf -y install fail2ban nftables dnf makecache -y && dnf -y install fail2ban nftables
fi fi
;; ;;
arch | manjaro | parch) arch | manjaro | parch)