Bumped port version to v1.1.7, fixed update path for pfSense 2.5 on pfsense-api CLI

jaredhendrickson13 · jaredhendrickson13 · commit 095d70b2272b · 2021-03-10T19:42:57.000-07:00
diff --git a/pfSense-pkg-API/files/usr/local/share/pfSense-pkg-API/manage.php b/pfSense-pkg-API/files/usr/local/share/pfSense-pkg-API/manage.php
@@ -81,8 +81,9 @@ function restore() {
 }
 
 function update() {
+    $pf_version = substr(file_get_contents("/etc/version"), 0, 3);
     echo shell_exec("/usr/sbin/pkg delete -y pfSense-pkg-API");
-    echo shell_exec("/usr/sbin/pkg add https://github.com/jaredhendrickson13/pfsense-api/releases/latest/download/pfSense-2.4-pkg-API.txz");
+    echo shell_exec("/usr/sbin/pkg add https://github.com/jaredhendrickson13/pfsense-api/releases/latest/download/pfSense-".$pf_version."-pkg-API.txz");
     echo shell_exec("/etc/rc.restart_webgui");
 }
 
diff --git a/tools/templates/Makefile.j2 b/tools/templates/Makefile.j2
@@ -2,7 +2,7 @@
 
 PORTNAME=pfSense-pkg-API
 PORTVERSION=1.1
-PORTREVISION=6
+PORTREVISION=7
 CATEGORIES=sysutils
 MASTER_SITES=# empty
 DISTFILES=# empty

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,9 @@ function restore() {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`function update() {`
	`84`	`+ $pf_version = substr(file_get_contents("/etc/version"), 0, 3);`
`84`	`85`	`echo shell_exec("/usr/sbin/pkg delete -y pfSense-pkg-API");`
`85`		`- echo shell_exec("/usr/sbin/pkg add https://github.com/jaredhendrickson13/pfsense-api/releases/latest/download/pfSense-2.4-pkg-API.txz");`
	`86`	`+ echo shell_exec("/usr/sbin/pkg add https://github.com/jaredhendrickson13/pfsense-api/releases/latest/download/pfSense-".$pf_version."-pkg-API.txz");`
`86`	`87`	`echo shell_exec("/etc/rc.restart_webgui");`
`87`	`88`	`}`
`88`	`89`