Browse Source

remove freebsd

theguy951357 1 năm trước cách đây
mục cha
commit
095d1b61e1
5 tập tin đã thay đổi với 17 bổ sung43 xóa
  1. 0 1
      .github/ISSUE_TEMPLATE/bug-report.yml
  2. 0 1
      .goreleaser.prerelease.yaml
  3. 0 1
      .goreleaser.yaml
  4. 1 1
      README.md
  5. 16 39
      scripts/nm-quick.sh

+ 0 - 1
.github/ISSUE_TEMPLATE/bug-report.yml

@@ -92,7 +92,6 @@ body:
       multiple: true
       options:
         - Linux
-        - FreeBSD
         - Windows
         - Mac
         - Unlisted

+ 0 - 1
.goreleaser.prerelease.yaml

@@ -23,7 +23,6 @@ builds:
       - linux_arm64
       - darwin_amd64
       - darwin_arm64
-      - freebsd_amd64
       - windows_amd64
     binary: 'nmctl'
 archives:

+ 0 - 1
.goreleaser.yaml

@@ -23,7 +23,6 @@ builds:
       - linux_arm64
       - darwin_amd64
       - darwin_arm64
-      - freebsd_amd64
       - windows_amd64
     binary: 'nmctl'
 archives:

+ 1 - 1
README.md

@@ -43,7 +43,7 @@
 | Create                                    | Manage                                  | Automate                                |
 |-------------------------------------------|-----------------------------------------|-----------------------------------------|
 | :heavy_check_mark: WireGuard Networks     | :heavy_check_mark: Admin UI             | :heavy_check_mark: Linux                |
-| :heavy_check_mark: Remote Access Gateways | :heavy_check_mark: OAuth                | :heavy_check_mark: FreeBSD              |
+| :heavy_check_mark: Remote Access Gateways | :heavy_check_mark: OAuth                | :heavy_check_mark: Docker              |
 | :heavy_check_mark: Mesh VPNs              | :heavy_check_mark: Private DNS          | :heavy_check_mark: Mac                  |
 | :heavy_check_mark: Site-to-Site           | :heavy_check_mark: Access Control Lists | :heavy_check_mark: Windows              |
 

+ 16 - 39
scripts/nm-quick.sh

@@ -412,10 +412,6 @@ install_dependencies() {
 		dependencies="git wireguard-tools dnsutils jq docker.io docker-compose grep gawk"
 		update_cmd='pacman -Sy'
 		install_cmd='pacman -S --noconfirm'
-	elif [ "${OS}" = "FreeBSD" ]; then
-		dependencies="git wireguard wget jq docker.io docker-compose grep gawk"
-		update_cmd='pkg update'
-		install_cmd='pkg install -y'
 	else
 		install_cmd=''
 	fi
@@ -441,25 +437,18 @@ install_dependencies() {
 	${update_cmd}
 
 	while [ -n "$1" ]; do
-		if [ "${OS}" = "FreeBSD" ]; then
-			is_installed=$(pkg check -d $1 | grep "Checking" | grep "done")
-			if [ "$is_installed" != "" ]; then
-				echo "  " $1 is installed
-			else
-				echo "  " $1 is not installed. Attempting install.
-				${install_cmd} $1
-				sleep 5
-				is_installed=$(pkg check -d $1 | grep "Checking" | grep "done")
-				if [ "$is_installed" != "" ]; then
-					echo "  " $1 is installed
-				elif [ -x "$(command -v $1)" ]; then
-					echo "  " $1 is installed
-				else
-					echo "  " FAILED TO INSTALL $1
-					echo "  " This may break functionality.
-				fi
-			fi
+		
+		if [ "${OS}" = "OpenWRT" ] || [ "${OS}" = "TurrisOS" ]; then
+			is_installed=$(opkg list-installed $1 | grep $1)
 		else
+			is_installed=$(dpkg-query -W --showformat='${Status}\n' $1 | grep "install ok installed")
+		fi
+		if [ "${is_installed}" != "" ]; then
+			echo "    " $1 is installed
+		else
+			echo "    " $1 is not installed. Attempting install.
+			${install_cmd} $1
+			sleep 5
 			if [ "${OS}" = "OpenWRT" ] || [ "${OS}" = "TurrisOS" ]; then
 				is_installed=$(opkg list-installed $1 | grep $1)
 			else
@@ -467,26 +456,14 @@ install_dependencies() {
 			fi
 			if [ "${is_installed}" != "" ]; then
 				echo "    " $1 is installed
+			elif [ -x "$(command -v $1)" ]; then
+				echo "  " $1 is installed
 			else
-				echo "    " $1 is not installed. Attempting install.
-				${install_cmd} $1
-				sleep 5
-				if [ "${OS}" = "OpenWRT" ] || [ "${OS}" = "TurrisOS" ]; then
-					is_installed=$(opkg list-installed $1 | grep $1)
-				else
-					is_installed=$(dpkg-query -W --showformat='${Status}\n' $1 | grep "install ok installed")
-				fi
-				if [ "${is_installed}" != "" ]; then
-					echo "    " $1 is installed
-				elif [ -x "$(command -v $1)" ]; then
-					echo "  " $1 is installed
-				else
-					echo "  " FAILED TO INSTALL $1
-					echo "  " This may break functionality.
-				fi
+				echo "  " FAILED TO INSTALL $1
+				echo "  " This may break functionality.
 			fi
 		fi
-		shift
+	shift
 	done
 
 	echo "-----------------------------------------------------"