Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-12-16 05:19:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhance AlmaLinux 9 support in installation scripts

Browse Source 
- Updated cyberpanel_upgrade.sh to differentiate AlmaLinux 9 for dnf package management and specific package installations.
- Improved OS detection logic to handle AlmaLinux 9 separately, ensuring correct repository setup and package installations.
- Enhanced error handling and logging for better feedback during the installation process.
- Refined version validation in cyberpanel.sh to support stable versions, development versions, and commit hashes.
- Streamlined installation process in install.sh to accommodate specific branch, tag, or commit installations.
This commit is contained in:
Master3395
2025-09-24 22:45:12 +02:00
parent d8378c4d19
commit 1a7688e3f2
5 changed files with 305 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cyberpanel.sh
View File

@@ -528,9 +528,13 @@ curl --max-time 20 -d '{"ipAddress": "'"$Server_IP"'", "InstallCyberPanelStatus"
}
Branch_Check() {
if [[ "$1" = *.*.* ]]; then
#check input if it's valid format as X.Y.Z
Output=$(awk -v num1="$Base_Number" -v num2="${1//[[:space:]]/}" '
# Enhanced version validation to handle stable versions, development versions, and commit hashes
if [[ "$1" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-dev)?$ ]]; then
# Handle version numbers (stable and development)
version_number=$(echo "$1" | sed 's/-dev$//')
# Check if version is higher than 2.3.4
Output=$(awk -v num1="$Base_Number" -v num2="$version_number" '
BEGIN {
print "num1", (num1 < num2 ? "<" : ">="), "num2"
}
@@ -539,11 +543,26 @@ if [[ "$1" = *.*.* ]]; then
echo -e "\nYou must use version number higher than 2.3.4"
exit
else
Branch_Name="v${1//[[:space:]]/}"
echo -e "\nSet branch name to $Branch_Name..."
# Handle both stable and development versions
if [[ "$1" =~ -dev$ ]]; then
Branch_Name="${1//[[:space:]]/}"
echo -e "\nSet branch name to $Branch_Name (development version)..."
else
Branch_Name="v${1//[[:space:]]/}"
echo -e "\nSet branch name to $Branch_Name (stable version)..."
fi
fi
elif [[ "$1" =~ ^[a-f0-9]{7,40}$ ]]; then
# Handle commit hashes (7-40 character hex strings)
commit_hash="${1//[[:space:]]/}"
Branch_Name="commit:$commit_hash"
echo -e "\nSet branch name to commit $commit_hash..."
echo -e "This will install from the specific commit: $commit_hash"
else
echo -e "\nPlease input a valid format version number."
echo -e "\nPlease input a valid format:"
echo -e " Version number: 2.4.4, 2.5.0, 2.5.5-dev"
echo -e " Commit hash: b05d9cb5bb3c277b22a6070f04844e8a7951585b"
echo -e " Short commit: b05d9cb"
exit
fi
}
@@ -1195,7 +1214,13 @@ else
echo -e "\nLocal MySQL selected..."
fi
echo -e "\nPress \e[31mEnter\e[39m key to continue with latest version or Enter specific version such as: \e[31m2.3.4\e[39m , \e[31m2.4.4\e[39m , \e[31m2.5.0\e[39m ...etc"
echo -e "\nPress \e[31mEnter\e[39m key to continue with latest version or Enter specific version such as:"
echo -e " \e[31m2.4.4\e[39m (stable version)"
echo -e " \e[31m2.5.0\e[39m (stable version)"
echo -e " \e[31m2.5.5-dev\e[39m (development version)"
echo -e " \e[31m2.6.0-dev\e[39m (development version)"
echo -e " \e[31mb05d9cb5bb3c277b22a6070f04844e8a7951585b\e[39m (specific commit)"
echo -e " \e[31mb05d9cb\e[39m (short commit hash)"
printf "%s" ""
read -r Tmp_Input