Update wgd.sh

v4.3.3 Merge

src/modules/AmneziaPeer.py

@@ -116,5 +116,5 @@ class AmneziaPeer(Peer):
             self.configuration.getPeers()
             return True, None
         except subprocess.CalledProcessError as exc:
-            current_app.logger.error(f"Subprocess call failed:\n{exc.output.decode("UTF-8")}")
+            current_app.logger.error(f"Subprocess call failed:\n{exc.output.decode('UTF-8')}")
             return False, "Internal server error"

src/modules/Peer.py

@@ -151,7 +151,7 @@ class Peer:
                 )
             return True, None
         except subprocess.CalledProcessError as exc:
-            current_app.logger.error(f"Subprocess call failed:\n{exc.output.decode("UTF-8")}")
+            current_app.logger.error(f"Subprocess call failed:\n{exc.output.decode('UTF-8')}")
             return False, "Internal server error"
 
     def downloadPeer(self) -> dict[str, str]:

src/static/app/package-lock.json

@@ -16,7 +16,7 @@
         "animate.css": "^4.1.1",
         "bootstrap": "^5.3.2",
         "bootstrap-icons": "^1.11.3",
-        "cidr-tools": "^11.3.3",
+        "cidr-tools": "^11.3.2",
         "css-color-converter": "^2.0.0",
         "dayjs": "^1.11.19",
         "electron-builder": "^26.7.0",
@@ -2860,12 +2860,12 @@
       }
     },
     "node_modules/cidr-tools": {
-      "version": "11.3.3",
-      "resolved": "https://registry.npmjs.org/cidr-tools/-/cidr-tools-11.3.3.tgz",
-      "integrity": "sha512-3fHQpk8DxUjO/nuoo9gTDpOKQDHoHarCxU3b7bkAq/nMHm54ADqoSQRF3l/GVbnOEtt5wfo/3vTEp4imLb7BZQ==",
+      "version": "11.3.2",
+      "resolved": "https://registry.npmjs.org/cidr-tools/-/cidr-tools-11.3.2.tgz",
+      "integrity": "sha512-yCtb8tB3CngbbzGUsEz8koyxHDxEA3VUOOldXFeLqQREWl1HK/FZxLzxxWQgPDPMwuvMF7q9kyIsFLmmBPaN6A==",
       "license": "BSD-2-Clause",
       "dependencies": {
-        "ip-bigint": "^8.3.4"
+        "ip-bigint": "^8.3.2"
       },
       "engines": {
         "node": ">=18"
@@ -4324,9 +4324,9 @@
       }
     },
     "node_modules/ip-bigint": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/ip-bigint/-/ip-bigint-8.3.4.tgz",
-      "integrity": "sha512-W34SH99LpEuCGlX+pv5EM8m57EMfm01o19Os2oQEHsmQVkHcIHtAU/YfpGFTAzUqM65e3GKA1JK/bHhNL1Ag4Q==",
+      "version": "8.3.3",
+      "resolved": "https://registry.npmjs.org/ip-bigint/-/ip-bigint-8.3.3.tgz",
+      "integrity": "sha512-r1bCRPxLv4PcyIB95FbsxaVvymNhFfbsIxrFdHqgZhWOBvfEPnzIHDGLAP+85cBozVf+XGaM00em4ZoJHm9EHw==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=18"

src/static/app/package.json

@@ -20,7 +20,7 @@
     "animate.css": "^4.1.1",
     "bootstrap": "^5.3.2",
     "bootstrap-icons": "^1.11.3",
-    "cidr-tools": "^11.3.3",
+    "cidr-tools": "^11.3.2",
     "css-color-converter": "^2.0.0",
     "dayjs": "^1.11.19",
     "electron-builder": "^26.7.0",

src/wgd.sh

@@ -247,27 +247,19 @@ _checkWireguard(){
 
 
 _checkPythonVersion(){
-	version_pass=$($pythonExecutable -c 'import sys; print("1") if (sys.version_info.major == 3 and sys.version_info.minor >= 10) else print("0");')
+	version_pass=$($pythonExecutable -c 'import sys; print("1") if (sys.version_info.major == 3 and sys.version_info.minor >= 12) else print("0");')
 	version=$($pythonExecutable --version)
 	if [ $version_pass == "1" ]
 	  	then 
 	  		printf "[WGDashboard] %s Found compatible version of Python. Will be using %s to install WGDashboard.\n" "$heavy_checkmark" "$($pythonExecutable --version)"
 			return;
-	elif python3.10 --version > /dev/null 2>&1
-		then
-	 		printf "[WGDashboard] %s Found Python 3.10. Will be using [python3.10] to install WGDashboard.\n" "$heavy_checkmark"
-	 		pythonExecutable="python3.10"
-	elif python3.11 --version > /dev/null 2>&1
-    	 then
-    	 	printf "[WGDashboard] %s Found Python 3.11. Will be using [python3.11] to install WGDashboard.\n" "$heavy_checkmark"
-    	 	pythonExecutable="python3.11"
     elif python3.12 --version > /dev/null 2>&1
     	 then
     	 	printf "[WGDashboard] %s Found Python 3.12. Will be using [python3.12] to install WGDashboard.\n" "$heavy_checkmark"
     	 	pythonExecutable="python3.12"
 	else
 		printf "[WGDashboard] %s Could not find a compatible version of Python. Current Python is %s.\n" "$heavy_crossmark" "$version"
-		printf "[WGDashboard] WGDashboard required Python 3.10, 3.11 or 3.12. Halting install now.\n"
+		printf "[WGDashboard] WGDashboard required Python 3.12 or above. Halting install now.\n"
 		kill $TOP_PID
 	fi
 }