Rework installpkg and uninstallpkg scripts to use pfSense-upgrade

2 files changed, 18 insertions, 39 deletions

diff --git a/src/etc/phpshellsessions/installpkg b/src/etc/phpshellsessions/installpkg
index 1ac71bf..a0e74c6 100644
--- a/src/etc/phpshellsessions/installpkg
+++ b/src/etc/phpshellsessions/installpkg
@@ -10,27 +10,16 @@ if (is_array($command_split)) {
 	$args = array_slice($argv, 2);
 }
 
-$pkg_name = $args[0];
+$pkg_name = $args[1];
 
-echo "Installing package \"{$pkg_name}\"...\n";
+pkg_remove_prefix($pkg_name);
 
-echo "Trying to fetch package info...";
-$pkg_info = get_pkg_info();
-if ($pkg_info) {
-	echo " Done.\n";
-} else {
-	echo "\n" . gettext(' >>> Unable to get pkg info.') . "\n";
-	return;
-}
-
-$static_output = "";
-$pkg_interface = "console";
+echo "Installing package \"{$pkg_name}\"... ";
 
-if (empty($pkg_info[$pkg_name])) {
-	echo "\nPackage not found.\n";
-	return;
+if (mwexec("/usr/local/sbin/{$g['product_name']}-upgrade -y -i {$g['pkg_prefix']}{$pkg_name}") == 0) {
+	echo "Done.\n";
+	return true;
+} else {
+	echo "Failed.\n";
+	return false;
 }
-
-install_package($pkg_name);
-
-echo "\nDone.\n";
diff --git a/src/etc/phpshellsessions/uninstallpkg b/src/etc/phpshellsessions/uninstallpkg
index 9030e56..941a8af 100644
--- a/src/etc/phpshellsessions/uninstallpkg
+++ b/src/etc/phpshellsessions/uninstallpkg
@@ -10,25 +10,15 @@ if (is_array($command_split)) {
 	$args = array_slice($argv, 2);
 }
 
-$pkg_name = $args[0];
-$pkg_info = array();
+$pkg_name = $args[1];
+pkg_remove_prefix($pkg_name);
 
-echo "Removing package \"{$pkg_name}\"...\n";
+echo "Removing package \"{$pkg_name}\"... ";
 
-foreach ($config['installedpackages']['package'] as $package) {
-	if ($pkg_name == $package['name']) {
-		$pkg_info = $package;
-	}
-}
-
-$static_output = "";
-$pkg_interface = "console";
-
-if (empty($pkg_info)) {
-	echo "\nPackage not installed.\n";
-	return;
+if (mwexec("/usr/local/sbin/{$g['product_name']}-upgrade -y -r {$g['pkg_prefix']}{$pkg_name}") == 0) {
+	echo "Done.\n";
+	return true;
+} else {
+	echo "Failed.\n";
+	return false;
 }
-
-uninstall_package($pkg_name);
-
-echo "\nDone.\n";