Skip to content

Commit 7ab1422

Browse files
master3395master3395
authored
Merge pull request #1582 from usmannasir/revert-1579-v2.5.5-dev
Revert "Enhance OS detection and support for AlmaLinux 10 and additional Ubun…"
2 parents 425e178 + 525f8b3 commit 7ab1422

14 files changed

+28
-285
lines changed

‎CPScripts/mailscannerinstaller.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ elif grep -q -E "CloudLinux 7|CloudLinux 8" /etc/os-release ; then
5555
Server_OS="CloudLinux"
5656
elif grep -q -E "Rocky Linux" /etc/os-release ; then
5757
Server_OS="RockyLinux"
58-
elif grep -q -E "Ubuntu 18.04|Ubuntu 20.04|Ubuntu 20.10|Ubuntu 22.04|Ubuntu 22.04.5|Ubuntu 24.04.3|Ubuntu 25.04|Ubuntu 25.10" /etc/os-release ; then
58+
elif grep -q -E "Ubuntu 18.04|Ubuntu 20.04|Ubuntu 20.10|Ubuntu 22.04" /etc/os-release ; then
5959
Server_OS="Ubuntu"
6060
elif grep -q -E "openEuler 20.03|openEuler 22.03" /etc/os-release ; then
6161
Server_OS="openEuler"
6262
else
6363
echo -e "Unable to detect your system..."
64-
echo -e "\nCyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, Ubuntu 22.04.5, Ubuntu 24.04.3, Ubuntu 25.04, Ubuntu 25.10, CentOS 7, CentOS 8, AlmaLinux 8, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n"
64+
echo -e "\nCyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, CentOS 7, CentOS 8, AlmaLinux 8, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n"
6565
exit
6666
fi
6767

‎CPScripts/mailscanneruninstaller.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ elif grep -q -E "CloudLinux 7|CloudLinux 8" /etc/os-release ; then
1212
Server_OS="CloudLinux"
1313
elif grep -q -E "Rocky Linux" /etc/os-release ; then
1414
Server_OS="RockyLinux"
15-
elif grep -q -E "Ubuntu 18.04|Ubuntu 20.04|Ubuntu 20.10|Ubuntu 22.04|Ubuntu 22.04.5|Ubuntu 24.04.3|Ubuntu 25.04|Ubuntu 25.10" /etc/os-release ; then
15+
elif grep -q -E "Ubuntu 18.04|Ubuntu 20.04|Ubuntu 20.10|Ubuntu 22.04" /etc/os-release ; then
1616
Server_OS="Ubuntu"
1717
elif grep -q -E "openEuler 20.03|openEuler 22.03" /etc/os-release ; then
1818
Server_OS="openEuler"
1919
else
2020
echo -e "Unable to detect your system..."
21-
echo -e "\nCyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, Ubuntu 22.04.5, Ubuntu 24.04.3, Ubuntu 25.04, Ubuntu 25.10, CentOS 7, CentOS 8, AlmaLinux 8, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n"
21+
echo -e "\nCyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, CentOS 7, CentOS 8, AlmaLinux 8, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n"
2222
exit
2323
fi
2424

‎INSTALLER_SUMMARY.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,10 @@ bash <(curl https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/c
9292

9393
## 🔧 **Fixed Issues:**
9494

95-
### **✅ AlmaLinux 9/10 Support**
95+
### **✅ AlmaLinux 9 Support**
9696
- Fixed `aspell` and `libc-client` dependency issues
97-
- Proper package handling for AlmaLinux 9/10
97+
- Proper package handling for AlmaLinux 9
9898
- Smart fallback for missing packages
99-
- Comprehensive AlmaLinux 10 compatibility fixes
10099

101100
### **✅ Modular Architecture**
102101
- Each module under 500 lines (as requested)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Fast • Secure • Scalable — Simplify hosting management with style.
7070

7171
| OS family | Recommended / Supported |
7272
| -------------------------- | ----------------------: |
73-
| Ubuntu 25.10, 25.04, 24.04.3, 24.04, 22.04.5, 22.04, 20.04 | ✅ Recommended |
73+
| Ubuntu 24.04, 22.04, 20.04 | ✅ Recommended |
7474
| Debian 13, 12, 11 | ✅ Supported |
7575
| AlmaLinux 10, 9, 8 | ✅ Supported |
7676
| RockyLinux 9, 8 | ✅ Supported |

‎cyberpanel.sh‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@ detect_os() {
8686
OS_FAMILY="rhel"
8787
PACKAGE_MANAGER="dnf"
8888
print_status "Detected: AlmaLinux 9"
89-
elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then
90-
SERVER_OS="AlmaLinux10"
91-
OS_FAMILY="rhel"
92-
PACKAGE_MANAGER="dnf"
93-
print_status "Detected: AlmaLinux 10"
9489
elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then
9590
SERVER_OS="AlmaLinux8"
9691
OS_FAMILY="rhel"
@@ -116,26 +111,6 @@ detect_os() {
116111
OS_FAMILY="rhel"
117112
PACKAGE_MANAGER="yum"
118113
print_status "Detected: Rocky Linux 8"
119-
elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then
120-
SERVER_OS="Ubuntu2510"
121-
OS_FAMILY="debian"
122-
PACKAGE_MANAGER="apt"
123-
print_status "Detected: Ubuntu 25.10"
124-
elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then
125-
SERVER_OS="Ubuntu2504"
126-
OS_FAMILY="debian"
127-
PACKAGE_MANAGER="apt"
128-
print_status "Detected: Ubuntu 25.04"
129-
elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then
130-
SERVER_OS="Ubuntu24043"
131-
OS_FAMILY="debian"
132-
PACKAGE_MANAGER="apt"
133-
print_status "Detected: Ubuntu 24.04.3"
134-
elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then
135-
SERVER_OS="Ubuntu22045"
136-
OS_FAMILY="debian"
137-
PACKAGE_MANAGER="apt"
138-
print_status "Detected: Ubuntu 22.04.5"
139114
elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then
140115
SERVER_OS="Ubuntu2204"
141116
OS_FAMILY="debian"
@@ -158,7 +133,7 @@ detect_os() {
158133
print_status "Detected: Debian GNU/Linux 11"
159134
else
160135
print_status "ERROR: Unsupported OS detected"
161-
print_status "Supported OS: AlmaLinux 8/9/10, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04/22.04.5/24.04.3/25.04/25.10, Debian 11/12"
136+
print_status "Supported OS: AlmaLinux 8/9, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04, Debian 11/12"
162137
return 1
163138
fi
164139

‎cyberpanel_clean.sh‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,6 @@ detect_os() {
7878
OS_FAMILY="rhel"
7979
PACKAGE_MANAGER="dnf"
8080
print_status "Detected: AlmaLinux 9"
81-
elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then
82-
SERVER_OS="AlmaLinux10"
83-
OS_FAMILY="rhel"
84-
PACKAGE_MANAGER="dnf"
85-
print_status "Detected: AlmaLinux 10"
8681
elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then
8782
SERVER_OS="AlmaLinux8"
8883
OS_FAMILY="rhel"
@@ -108,26 +103,6 @@ detect_os() {
108103
OS_FAMILY="rhel"
109104
PACKAGE_MANAGER="yum"
110105
print_status "Detected: Rocky Linux 8"
111-
elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then
112-
SERVER_OS="Ubuntu2510"
113-
OS_FAMILY="debian"
114-
PACKAGE_MANAGER="apt"
115-
print_status "Detected: Ubuntu 25.10"
116-
elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then
117-
SERVER_OS="Ubuntu2504"
118-
OS_FAMILY="debian"
119-
PACKAGE_MANAGER="apt"
120-
print_status "Detected: Ubuntu 25.04"
121-
elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then
122-
SERVER_OS="Ubuntu24043"
123-
OS_FAMILY="debian"
124-
PACKAGE_MANAGER="apt"
125-
print_status "Detected: Ubuntu 24.04.3"
126-
elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then
127-
SERVER_OS="Ubuntu22045"
128-
OS_FAMILY="debian"
129-
PACKAGE_MANAGER="apt"
130-
print_status "Detected: Ubuntu 22.04.5"
131106
elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then
132107
SERVER_OS="Ubuntu2204"
133108
OS_FAMILY="debian"
@@ -150,7 +125,7 @@ detect_os() {
150125
print_status "Detected: Debian GNU/Linux 11"
151126
else
152127
print_status "ERROR: Unsupported OS detected"
153-
print_status "Supported OS: AlmaLinux 8/9/10, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04/22.04.5/24.04.3/25.04/25.10, Debian 11/12"
128+
print_status "Supported OS: AlmaLinux 8/9, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04, Debian 11/12"
154129
return 1
155130
fi
156131

‎cyberpanel_complete.sh‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ detect_os() {
9090
OS_FAMILY="rhel"
9191
PACKAGE_MANAGER="dnf"
9292
print_status "$GREEN" "Detected: AlmaLinux 9"
93-
elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then
94-
SERVER_OS="AlmaLinux10"
95-
OS_FAMILY="rhel"
96-
PACKAGE_MANAGER="dnf"
97-
print_status "$GREEN" "Detected: AlmaLinux 10"
9893
elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then
9994
SERVER_OS="AlmaLinux8"
10095
OS_FAMILY="rhel"
@@ -120,26 +115,6 @@ detect_os() {
120115
OS_FAMILY="rhel"
121116
PACKAGE_MANAGER="yum"
122117
print_status "$GREEN" "Detected: Rocky Linux 8"
123-
elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then
124-
SERVER_OS="Ubuntu2510"
125-
OS_FAMILY="debian"
126-
PACKAGE_MANAGER="apt"
127-
print_status "$GREEN" "Detected: Ubuntu 25.10"
128-
elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then
129-
SERVER_OS="Ubuntu2504"
130-
OS_FAMILY="debian"
131-
PACKAGE_MANAGER="apt"
132-
print_status "$GREEN" "Detected: Ubuntu 25.04"
133-
elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then
134-
SERVER_OS="Ubuntu24043"
135-
OS_FAMILY="debian"
136-
PACKAGE_MANAGER="apt"
137-
print_status "$GREEN" "Detected: Ubuntu 24.04.3"
138-
elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then
139-
SERVER_OS="Ubuntu22045"
140-
OS_FAMILY="debian"
141-
PACKAGE_MANAGER="apt"
142-
print_status "$GREEN" "Detected: Ubuntu 22.04.5"
143118
elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then
144119
SERVER_OS="Ubuntu2204"
145120
OS_FAMILY="debian"
@@ -162,7 +137,7 @@ detect_os() {
162137
print_status "$GREEN" "Detected: Debian GNU/Linux 11"
163138
else
164139
print_status "$RED" "❌ Unsupported OS detected"
165-
print_status "$YELLOW" "Supported OS: AlmaLinux 8/9/10, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04/22.04.5/24.04.3/25.04/25.10, Debian 11/12"
140+
print_status "$YELLOW" "Supported OS: AlmaLinux 8/9, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04, Debian 11/12"
166141
return 1
167142
fi
168143

‎cyberpanel_simple.sh‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@ detect_os() {
7676
OS_FAMILY="rhel"
7777
PACKAGE_MANAGER="dnf"
7878
print_status "Detected: AlmaLinux 9"
79-
elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then
80-
SERVER_OS="AlmaLinux10"
81-
OS_FAMILY="rhel"
82-
PACKAGE_MANAGER="dnf"
83-
print_status "Detected: AlmaLinux 10"
8479
elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then
8580
SERVER_OS="AlmaLinux8"
8681
OS_FAMILY="rhel"
@@ -106,26 +101,6 @@ detect_os() {
106101
OS_FAMILY="rhel"
107102
PACKAGE_MANAGER="yum"
108103
print_status "Detected: Rocky Linux 8"
109-
elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then
110-
SERVER_OS="Ubuntu2510"
111-
OS_FAMILY="debian"
112-
PACKAGE_MANAGER="apt"
113-
print_status "Detected: Ubuntu 25.10"
114-
elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then
115-
SERVER_OS="Ubuntu2504"
116-
OS_FAMILY="debian"
117-
PACKAGE_MANAGER="apt"
118-
print_status "Detected: Ubuntu 25.04"
119-
elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then
120-
SERVER_OS="Ubuntu24043"
121-
OS_FAMILY="debian"
122-
PACKAGE_MANAGER="apt"
123-
print_status "Detected: Ubuntu 24.04.3"
124-
elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then
125-
SERVER_OS="Ubuntu22045"
126-
OS_FAMILY="debian"
127-
PACKAGE_MANAGER="apt"
128-
print_status "Detected: Ubuntu 22.04.5"
129104
elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then
130105
SERVER_OS="Ubuntu2204"
131106
OS_FAMILY="debian"
@@ -148,7 +123,7 @@ detect_os() {
148123
print_status "Detected: Debian GNU/Linux 11"
149124
else
150125
print_status "ERROR: Unsupported OS detected"
151-
print_status "Supported OS: AlmaLinux 8/9/10, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04/22.04.5/24.04.3/25.04/25.10, Debian 11/12"
126+
print_status "Supported OS: AlmaLinux 8/9, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04, Debian 11/12"
152127
return 1
153128
fi
154129

‎cyberpanel_standalone.sh‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ detect_os() {
8989
OS_FAMILY="rhel"
9090
PACKAGE_MANAGER="dnf"
9191
print_status "$GREEN" "Detected: AlmaLinux 9"
92-
elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then
93-
SERVER_OS="AlmaLinux10"
94-
OS_FAMILY="rhel"
95-
PACKAGE_MANAGER="dnf"
96-
print_status "$GREEN" "Detected: AlmaLinux 10"
9792
elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then
9893
SERVER_OS="AlmaLinux8"
9994
OS_FAMILY="rhel"
@@ -119,26 +114,6 @@ detect_os() {
119114
OS_FAMILY="rhel"
120115
PACKAGE_MANAGER="yum"
121116
print_status "$GREEN" "Detected: Rocky Linux 8"
122-
elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then
123-
SERVER_OS="Ubuntu2510"
124-
OS_FAMILY="debian"
125-
PACKAGE_MANAGER="apt"
126-
print_status "$GREEN" "Detected: Ubuntu 25.10"
127-
elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then
128-
SERVER_OS="Ubuntu2504"
129-
OS_FAMILY="debian"
130-
PACKAGE_MANAGER="apt"
131-
print_status "$GREEN" "Detected: Ubuntu 25.04"
132-
elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then
133-
SERVER_OS="Ubuntu24043"
134-
OS_FAMILY="debian"
135-
PACKAGE_MANAGER="apt"
136-
print_status "$GREEN" "Detected: Ubuntu 24.04.3"
137-
elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then
138-
SERVER_OS="Ubuntu22045"
139-
OS_FAMILY="debian"
140-
PACKAGE_MANAGER="apt"
141-
print_status "$GREEN" "Detected: Ubuntu 22.04.5"
142117
elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then
143118
SERVER_OS="Ubuntu2204"
144119
OS_FAMILY="debian"
@@ -161,7 +136,7 @@ detect_os() {
161136
print_status "$GREEN" "Detected: Debian GNU/Linux 11"
162137
else
163138
print_status "$RED" "❌ Unsupported OS detected"
164-
print_status "$YELLOW" "Supported OS: AlmaLinux 8/9/10, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04/22.04.5/24.04.3/25.04/25.10, Debian 11/12"
139+
print_status "$YELLOW" "Supported OS: AlmaLinux 8/9, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04, Debian 11/12"
165140
return 1
166141
fi
167142

0 commit comments

Comments
 (0)