UniqueSoft/openpanel
2
0
Fork 0
mirror of https://github.com/stefanpejcic/openpanel synced 2025-06-26 18:28:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update INSTALL.sh

Browse Source
This commit is contained in:
Stefan Pejcic 2024-10-12 23:45:38 +02:00 committed by GitHub
parent 4ce6ad9ca4
commit f6c63a6e67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
INSTALL.sh
View File

@ -204,18 +204,17 @@ get_server_ipv4(){
wget --timeout=2 -qO- $IP_SERVER_2 || \ wget --timeout=2 -qO- $IP_SERVER_2 || \
curl --silent --max-time 2 -4 $IP_SERVER_3) curl --silent --max-time 2 -4 $IP_SERVER_3)
# If site is not available, get the ipv4 from the hostname -I # If no site is available, get the ipv4 from the hostname -I
if [ -z "$current_ip" ]; then if [ -z "$current_ip" ]; then
# current_ip=$(hostname -I | awk '{print $1}')
# ip addr command is more reliable then hostname - to avoid getting private ip # ip addr command is more reliable then hostname - to avoid getting private ip
current_ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/) current_ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/)
fi fi
is_valid_ipv4() { is_valid_ipv4() {
local ip=$1 local ip=$1
# Check if IPv4 is valid # is it ip
[[ $ip =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]] && \ [[ $ip =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]] && \
# Check if IP is not private # is it private
! [[ $ip =~ ^10\. ]] && \ ! [[ $ip =~ ^10\. ]] && \
! [[ $ip =~ ^172\.(1[6-9]|2[0-9]|3[0-1])\. ]] && \ ! [[ $ip =~ ^172\.(1[6-9]|2[0-9]|3[0-1])\. ]] && \
! [[ $ip =~ ^192\.168\. ]] ! [[ $ip =~ ^192\.168\. ]]
@ -231,7 +230,6 @@ get_server_ipv4(){
set_version_to_install(){ set_version_to_install(){
if [ "$CUSTOM_VERSION" = false ]; then if [ "$CUSTOM_VERSION" = false ]; then
# Fetch the latest version
PANEL_VERSION=$(curl --silent --max-time 10 -4 https://openpanel.org/version) PANEL_VERSION=$(curl --silent --max-time 10 -4 https://openpanel.org/version)
if [[ $PANEL_VERSION =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then if [[ $PANEL_VERSION =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then
PANEL_VERSION=$PANEL_VERSION PANEL_VERSION=$PANEL_VERSION
@ -242,7 +240,7 @@ set_version_to_install(){
} }
# print fullwidth line # prints fullwidth line
print_space_and_line() { print_space_and_line() {
echo " " echo " "
printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' - printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' -