UniqueSoft/WGDashboard
2
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard synced 2025-02-26 05:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dropping support plan to OpenBSD

Browse Source
This commit is contained in:
Donald Zou 2024-11-23 18:08:14 +08:00
parent 71ee784003
commit 8e2934533b
2 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dashboard.py
View File

@ -973,13 +973,13 @@ class WireguardConfiguration:
self.getStatus() self.getStatus()
if self.Status: if self.Status:
try: try:
check = subprocess.call(f"wg-quick down {self.Name}", check = subprocess.check_output(f"wg-quick down {self.Name}",
shell=True, stderr=subprocess.STDOUT) shell=True, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as exc: except subprocess.CalledProcessError as exc:
return False, str(exc.output.strip().decode("utf-8")) return False, str(exc.output.strip().decode("utf-8"))
else: else:
try: try:
check = subprocess.call(f"wg-quick up {self.Name}", shell=True, stderr=subprocess.STDOUT) check = subprocess.check_output(f"wg-quick up {self.Name}", shell=True, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as exc: except subprocess.CalledProcessError as exc:
return False, str(exc.output.strip().decode("utf-8")) return False, str(exc.output.strip().decode("utf-8"))
self.getStatus() self.getStatus()

41
src/wgd.sh
View File

@ -65,8 +65,6 @@ _determineOS(){
OS=$ID OS=$ID
elif [ -f /etc/redhat-release ]; then elif [ -f /etc/redhat-release ]; then
OS="redhat" OS="redhat"
elif [ "$(uname)" = "OpenBSD" ]; then
OS="openbsd"
else else
printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark" printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark"
printf "%s\n" "$helpMsg" printf "%s\n" "$helpMsg"
@ -93,19 +91,6 @@ _installPython(){
alpine) alpine)
{ sudo apk update; sudo apk add python3 net-tools --no-cache; printf "\n\n"; } >> ./log/install.txt { sudo apk update; sudo apk add python3 net-tools --no-cache; printf "\n\n"; } >> ./log/install.txt
;; ;;
openbsd)
if [ "$(uname -r)" = "7.6" ]; then
{ pkg_add -v python-3.11.10p0; printf "\n\n"; } >> ./log/install.txt
elif [ "$(uname -r)" = "7.5" ]; then
{ pkg_add -v python-3.11.8; printf "\n\n"; } >> ./log/install.txt
elif [ "$(uname -r)" = "7.4" ]; then
{ pkg_add -v python-3.11.5; printf "\n\n"; } >> ./log/install.txt
else
printf "[WGDashboard] %s Current OpenBSD version is not supported. Please install Python 3.10+ manually\n" "$heavy_crossmark"
printf "%s\n" "$helpMsg"
kill $TOP_PID
fi
;;
esac esac
if ! python3 --version > /dev/null 2>&1 if ! python3 --version > /dev/null 2>&1
@ -135,19 +120,6 @@ _installPythonVenv(){
alpine) alpine)
{ sudo apk update; sudo apk add py3-virtualenv ; printf "\n\n"; } >> ./log/install.txt { sudo apk update; sudo apk add py3-virtualenv ; printf "\n\n"; } >> ./log/install.txt
;; ;;
openbsd)
if [ "$(uname -r)" = "7.4" ]; then
{ pkg_add -v py3-virtualenv-20.24.4; printf "\n\n"; } >> ./log/install.txt
elif [ "$(uname -r)" = "7.5" ]; then
{ pkg_add -v py3-virtualenv-20.25.1; printf "\n\n"; } >> ./log/install.txt
elif [ "$(uname -r)" = "7.6" ]; then
{ pkg_add -v py3-virtualenv-20.25.3; printf "\n\n"; } >> ./log/install.txt
else
printf "[WGDashboard] %s Current OpenBSD version is not supported. Please install Python 3 Virtual Environment manually\n" "$heavy_crossmark"
printf "%s\n" "$helpMsg"
kill $TOP_PID
fi
;;
*) *)
printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark" printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark"
printf "%s\n" "$helpMsg" printf "%s\n" "$helpMsg"
@ -193,19 +165,6 @@ _installPythonPip(){
alpine) alpine)
{ sudo apk update; sudo apk add py3-pip --no-cache; printf "\n\n"; } >> ./log/install.txt { sudo apk update; sudo apk add py3-pip --no-cache; printf "\n\n"; } >> ./log/install.txt
;; ;;
openbsd)
if [ "$(uname -r)" = "7.4" ]; then
{ pkg_add -v py3-pip-23.2.1; printf "\n\n"; } >> ./log/install.txt
elif [ "$(uname -r)" = "7.5" ]; then
{ pkg_add -v py3-pip-24.0; printf "\n\n"; } >> ./log/install.txt
elif [ "$(uname -r)" = "7.6" ]; then
{ pkg_add -v py3-pip-24.2; printf "\n\n"; } >> ./log/install.txt
else
printf "[WGDashboard] %s Current OpenBSD version is not supported. Please install Python 3 Pip manually\n" "$heavy_crossmark"
printf "%s\n" "$helpMsg"
kill $TOP_PID
fi
;;
*) *)
printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark" printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark"
printf "%s\n" "$helpMsg" printf "%s\n" "$helpMsg"