Просмотр исходного кода

Remove changes made for RHEL support in the installer

Jaap Marcus 1 год назад
Родитель
Сommit
d07676c343
1 измененных файлов с 0 добавлено и 39 удалено
  1. 0 39
      install/hst-install.sh

+ 0 - 39
install/hst-install.sh

@@ -58,21 +58,6 @@ if [ -e "/etc/os-release" ] && [ ! -e "/etc/redhat-release" ]; then
 	else
 		type="NoSupport"
 	fi
-# elif [ -e "/etc/os-release" ] && [ -e "/etc/redhat-release" ]; then
-# 	type=$(grep "^ID=" /etc/os-release | cut -f 2 -d '"')
-# 	if [ "$type" = "rhel" ]; then
-# 		release=$(cat /etc/redhat-release | cut -f 1 -d '.' | awk '{print $3}')
-# 		VERSION='rhel'
-# 	elif [ "$type" = "almalinux" ]; then
-# 		release=$(cat /etc/redhat-release | cut -f 1 -d '.' | awk '{print $3}')
-# 		VERSION='almalinux'
-# 	elif [ "$type" = "eurolinux" ]; then
-# 		release=$(cat /etc/redhat-release | cut -f 1 -d '.' | awk '{print $3}')
-# 		VERSION='eurolinux'
-# 	elif [ "$type" = "rocky" ]; then
-# 		release=$(cat /etc/redhat-release | cut -f 1 -d '.' | awk '{print $3}')
-# 		VERSION='rockylinux'
-# 	fi
 else
 	type="NoSupport"
 fi
@@ -84,8 +69,6 @@ no_support_message() {
 	echo "****************************************************"
 	echo "  Debian 11, 12"
 	echo "  Ubuntu 20.04, 22.04, 24.04 LTS"
-	# Commenting this out for now
-	# echo "  AlmaLinux, EuroLinux, Red Hat EnterPrise Linux, Rocky Linux 8,9"
 	echo ""
 	exit 1
 }
@@ -97,16 +80,6 @@ fi
 check_wget_curl() {
 	# Check wget
 	if [ -e '/usr/bin/wget' ]; then
-		# if [ -e '/etc/redhat-release' ]; then
-		# 	wget -q https://raw.githubusercontent.com/hestiacp/hestiacp/release/install/hst-install-rhel.sh -O hst-install-rhel.sh
-		# 	if [ "$?" -eq '0' ]; then
-		# 		bash hst-install-rhel.sh $*
-		# 		exit
-		# 	else
-		# 		echo "Error: hst-install-rhel.sh download failed."
-		# 		exit 1
-		# 	fi
-		# else
 		wget -q https://raw.githubusercontent.com/hestiacp/hestiacp/release/install/hst-install-$type.sh -O hst-install-$type.sh
 		if [ "$?" -eq '0' ]; then
 			bash hst-install-$type.sh $*
@@ -120,16 +93,6 @@ check_wget_curl() {
 
 	# Check curl
 	if [ -e '/usr/bin/curl' ]; then
-		# if [ -e '/etc/redhat-release' ]; then
-		# 	curl -s -O https://raw.githubusercontent.com/hestiacp/hestiacp/release/install/hst-install-rhel.sh
-		# 	if [ "$?" -eq '0' ]; then
-		# 		bash hst-install-rhel.sh $*
-		# 		exit
-		# 	else
-		# 		echo "Error: hst-install-rhel.sh download failed."
-		# 		exit 1
-		# 	fi
-		# else
 		curl -s -O https://raw.githubusercontent.com/hestiacp/hestiacp/release/install/hst-install-$type.sh
 		if [ "$?" -eq '0' ]; then
 			bash hst-install-$type.sh $*
@@ -146,8 +109,6 @@ check_wget_curl() {
 # of OS-specific installer, and throw error message if unsupported OS detected.
 if [[ "$release" =~ ^(11|12|20.04|22.04|24.04)$ ]]; then
 	check_wget_curl $*
-# elif [[ -e "/etc/redhat-release" ]] && [[ "$release" =~ ^(8|9)$ ]]; then
-# 	check_wget_curl $*
 else
 	no_support_message
 fi