kamp/WGDashboard
1
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard.git synced 2024-11-22 15:20:09 +01:00
Code

Update wgd.sh

Browse Source 
Selectively use a specific version of Python: 3.10, 3.11 or 3.12
This commit is contained in:
Donald Zou 2024-08-16 01:47:44 -04:00
parent e68257d6c9
commit 0487980d2f
1 changed files with 74 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/wgd.sh
View File

@ -6,6 +6,7 @@ app_name="dashboard.py"
app_official_name="WGDashboard" app_official_name="WGDashboard"
venv_python="./venv/bin/python3" venv_python="./venv/bin/python3"
venv_gunicorn="./venv/bin/gunicorn" venv_gunicorn="./venv/bin/gunicorn"
pythonExecutable="python3"
PID_FILE=./gunicorn.pid PID_FILE=./gunicorn.pid
environment=$(if [[ $ENVIRONMENT ]]; then echo $ENVIRONMENT; else echo 'develop'; fi) environment=$(if [[ $ENVIRONMENT ]]; then echo $ENVIRONMENT; else echo 'develop'; fi)
@ -40,10 +41,14 @@ _check_and_set_venv(){
VIRTUAL_ENV="./venv" VIRTUAL_ENV="./venv"
if [ ! -d $VIRTUAL_ENV ]; then if [ ! -d $VIRTUAL_ENV ]; then
printf "[WGDashboard] Creating Python Virtual Environment under ./venv\n" printf "[WGDashboard] Creating Python Virtual Environment under ./venv\n"
{ python3 -m venv $VIRTUAL_ENV; } >> ./log/install.txt { $pythonExecutable -m venv $VIRTUAL_ENV; } >> ./log/install.txt
fi
if ! venv_python --version > /dev/null 2>&1
then
printf "[WGDashboard] Python Virtual Environment under ./venv failed to create. Halting now.\n"
exit 1
fi fi
printf "[WGDashboard] Activate Python Virtual Environment under ./venv\n"
. ${VIRTUAL_ENV}/bin/activate
} }
_determineOS(){ _determineOS(){
@ -73,14 +78,6 @@ _installPython(){
{ sudo yum install -y python3 net-tools ; printf "\n\n"; } >> ./log/install.txt { sudo yum install -y python3 net-tools ; printf "\n\n"; } >> ./log/install.txt
fi fi
;; ;;
# arch)
# { sudo pacman -Sy python python-pip; printf "\n\n"; } >> ./log/install.txt
# ;;
# *)
# printf "[WGDashboard] Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based and Arch-based OS."
# printf "%s" "$helpMsg"
# exit 1
# ;;
esac esac
if ! python3 --version > /dev/null 2>&1 if ! python3 --version > /dev/null 2>&1
@ -94,9 +91,15 @@ _installPython(){
} }
_installPythonVenv(){ _installPythonVenv(){
if ! $pythonExecutable -m venv -h > /dev/null 2>&1
then
case "$OS" in case "$OS" in
ubuntu|debian) ubuntu|debian)
if [ "$pythonExecutable" = "python" ]; then
{ sudo apt update ; sudo apt-get install -y python3-venv; printf "\n\n"; } &>> ./log/install.txt { sudo apt update ; sudo apt-get install -y python3-venv; printf "\n\n"; } &>> ./log/install.txt
else
{ sudo add-apt-repository ppa:deadsnakes/ppa -y; sudo apt-get update; sudo apt-get install $pythonExecutable-venv; printf "\n\n"; } &>> ./log/install.txt
fi
;; ;;
centos|fedora|redhat) centos|fedora|redhat)
if command -v dnf &> /dev/null; then if command -v dnf &> /dev/null; then
@ -111,8 +114,9 @@ _installPythonVenv(){
exit 1 exit 1
;; ;;
esac esac
fi
if ! python3 -m venv -h > /dev/null 2>&1 if ! $pythonExecutable -m venv -h > /dev/null 2>&1
then then
printf "[WGDashboard] Python Virtual Environment is still not installed, halting script now.\n" printf "[WGDashboard] Python Virtual Environment is still not installed, halting script now.\n"
printf "%s\n" "$helpMsg" printf "%s\n" "$helpMsg"
@ -122,25 +126,13 @@ _installPythonVenv(){
} }
_installPythonPip(){ _installPythonPip(){
case "$OS" in
ubuntu|debian)
{ sudo apt update ; sudo apt-get install -y python3-pip; printf "\n\n"; } &>> ./log/install.txt
;;
centos|fedora|redhat)
if command -v dnf &> /dev/null; then
{ sudo dnf install -y python3-pip; printf "\n\n"; } >> ./log/install.txt
else
{ sudo yum install -y python3-pip printf "\n\n"; } >> ./log/install.txt
fi
;;
*)
printf "[WGDashboard] Sorry, your OS is not support auto install. Currently the install script only support Debian-based, Red Hat-based OS."
printf "%s\n" "$helpMsg"
exit 1
;;
esac
if ! python3 -m pip -h > /dev/null 2>&1 if ! $pythonExecutable -m pip -h > /dev/null 2>&1
then
{ $pythonExecutable -m ensurepip --default-pip; printf "\n\n"; } &>> ./log/install.txt
fi
if ! $pythonExecutable -m pip -h > /dev/null 2>&1
then then
printf "[WGDashboard] Python Package Manager (PIP) is still not installed, halting script now.\n" printf "[WGDashboard] Python Package Manager (PIP) is still not installed, halting script now.\n"
printf "%s\n" "$helpMsg" printf "%s\n" "$helpMsg"
@ -162,6 +154,31 @@ _checkWireguard(){
fi fi
} }
_checkPythonVersion(){
version_pass=$(pythonExecutable -c 'import sys; print("1") if (sys.version_info.major == 3 and sys.version_info.minor >= 10) else print("0");')
if [ $version_pass == "0" ]
then
printf "[WGDashboard] WGDashboard required Python 3.10 or above. Looking for specific Python version.\n"
elif python3.10 --version > /dev/null 2>&1
then
printf "[WGDashboard] Found Python 3.10. Will be using python3.10 to install WGDashboard.\n"
pythonExecutable="python3.10"
elif python3.11 --version > /dev/null 2>&1
then
printf "[WGDashboard] Found Python 3.11. Will be using python3.10 to install WGDashboard.\n"
pythonExecutable="python3.11"
elif python3.12 --version > /dev/null 2>&1
then
printf "[WGDashboard] Found Python 3.12. Will be using python3.10 to install WGDashboard.\n"
pythonExecutable="python3.12"
else
printf "[WGDashboard] Could not find a compatible version of Python. WGDashboard required Python 3.10, 3.11 or 3.12. Halting install now.\n"
exit 1
fi
}
install_wgd(){ install_wgd(){
printf "[WGDashboard] Starting to install WGDashboard\n" printf "[WGDashboard] Starting to install WGDashboard\n"
_checkWireguard _checkWireguard
@ -181,13 +198,7 @@ install_wgd(){
printf "[WGDashboard] \xE2\x9C\x94 Python is installed\n" printf "[WGDashboard] \xE2\x9C\x94 Python is installed\n"
fi fi
version_pass=$(python3 -c 'import sys; print("1") if (sys.version_info.major == 3 and sys.version_info.minor >= 10) else print("0");') _checkPythonVersion
if [ $version_pass == "0" ]
then
printf "[WGDashboard] WGDashboard required Python 3.10 or above\n"
exit 1
fi
_installPythonVenv _installPythonVenv
_installPythonPip _installPythonPip
@ -201,9 +212,9 @@ install_wgd(){
fi fi
_check_and_set_venv _check_and_set_venv
printf "[WGDashboard] Upgrading Python Package Manage (PIP)\n" printf "[WGDashboard] Upgrading Python Package Manage (PIP)\n"
{ date; python3 -m pip install pip; printf "\n\n"; } >> ./log/install.txt { date; venv_python -m pip install pip; printf "\n\n"; } >> ./log/install.txt
printf "[WGDashboard] Installing latest Python dependencies\n" printf "[WGDashboard] Installing latest Python dependencies\n"
{ date; python3 -m pip install -r requirements.txt ; printf "\n\n"; } >> ./log/install.txt { date; venv_python -m pip install -r requirements.txt ; printf "\n\n"; } >> ./log/install.txt
printf "[WGDashboard] WGDashboard installed successfully!\n" printf "[WGDashboard] WGDashboard installed successfully!\n"
printf "[WGDashboard] Enter ./wgd.sh start to start the dashboard\n" printf "[WGDashboard] Enter ./wgd.sh start to start the dashboard\n"
} }
@ -281,7 +292,7 @@ start_wgd_debug() {
} }
update_wgd() { update_wgd() {
new_ver=$(python3 -c "import json; import urllib.request; data = urllib.request.urlopen('https://api.github.com/repos/donaldzou/WGDashboard/releases/latest').read(); output = json.loads(data);print(output['tag_name'])") new_ver=$(venv_python -c "import json; import urllib.request; data = urllib.request.urlopen('https://api.github.com/repos/donaldzou/WGDashboard/releases/latest').read(); output = json.loads(data);print(output['tag_name'])")
printf "%s\n" "$dashes" printf "%s\n" "$dashes"
printf "[WGDashboard] Are you sure you want to update to the %s? (Y/N): " "$new_ver" printf "[WGDashboard] Are you sure you want to update to the %s? (Y/N): " "$new_ver"
read up read up