From b2391322d4db6b36be7814f49d8e3e105f3082a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Thu, 11 Feb 2016 09:38:35 +0100
Subject: [PATCH] Removed sudo stuff from plugin manager, don't display full
 pip command

---
 src/octoprint/plugins/pluginmanager/__init__.py  |  5 ++---
 .../pluginmanager/static/js/pluginmanager.js     | 11 ++---------
 .../templates/pluginmanager_settings.jinja2      | 16 ++--------------
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
index 7f51f74f..3bdffeb5 100644
--- a/src/octoprint/plugins/pluginmanager/__init__.py
+++ b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -188,13 +188,12 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 		               octoprint=self._get_octoprint_version_string(),
 		               pip=dict(
 		                   available=self._pip_caller.available,
-		                   command=self._pip_caller.command,
 		                   version=self._pip_caller.version_string,
 		                   install_dir=self._pip_caller.install_dir,
-		                   use_sudo=self._pip_caller.use_sudo,
 		                   use_user=self._pip_caller.use_user,
 		                   virtual_env=self._pip_caller.virtual_env,
-		                   additional_args=self._settings.get(["pip_args"])
+		                   additional_args=self._settings.get(["pip_args"]),
+		                   python=sys.executable
 		               ))
 
 	def on_api_command(self, command, data):
diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index ae574e99..7b6ac520 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -148,17 +148,13 @@ $(function() {
         self.followDependencyLinks = ko.observable(false);
 
         self.pipAvailable = ko.observable(false);
-        self.pipCommand = ko.observable();
         self.pipVersion = ko.observable();
         self.pipInstallDir = ko.observable();
         self.pipUseUser = ko.observable();
-        self.pipUseSudo = ko.observable();
         self.pipVirtualEnv = ko.observable();
         self.pipAdditionalArgs = ko.observable();
+        self.pipPython = ko.observable();
 
-        self.pipUseSudoString = ko.pureComputed(function() {
-            return self.pipUseSudo() ? "yes" : "no";
-        });
         self.pipUseUserString = ko.pureComputed(function() {
             return self.pipUseUser() ? "yes" : "no";
         });
@@ -305,19 +301,16 @@ $(function() {
         self._fromPipResponse = function(data) {
             self.pipAvailable(data.available);
             if (data.available) {
-                self.pipCommand(data.command);
                 self.pipVersion(data.version);
                 self.pipInstallDir(data.install_dir);
                 self.pipUseUser(data.use_user);
-                self.pipUseSudo(data.use_sudo);
                 self.pipVirtualEnv(data.virtual_env);
                 self.pipAdditionalArgs(data.additional_args);
+                self.pipPython(data.python);
             } else {
-                self.pipCommand(undefined);
                 self.pipVersion(undefined);
                 self.pipInstallDir(undefined);
                 self.pipUseUser(undefined);
-                self.pipUseSudo(undefined);
                 self.pipVirtualEnv(undefined);
                 self.pipAdditionalArgs(undefined);
             }
diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
index 926847a5..0358cf3a 100644
--- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
+++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
@@ -13,19 +13,8 @@
 {% endtrans %}</div>
 {% endmacro %}
 
-{% macro pluginmanager_sudopip() %}
-<div class="alert alert-error" data-bind="visible: pipUseSudo()">{% trans %}
-    The <code>pip</code> command is configured to use <code>sudo</code>. This
-    is <strong>not</strong> recommended due to security reasons. It is <strong>strongly</strong>
-    suggested you install OctoPrint under a
-    <a href="https://github.com/foosel/OctoPrint/#installation">user-owned virtual environment</a>
-    so that the use of <code>sudo</code> is not needed for plugin management.
-{% endtrans %}</div>
-{% endmacro %}
-
 {{ pluginmanager_printing() }}
 {{ pluginmanager_nopip() }}
-{{ pluginmanager_sudopip() }}
 
 <div class="pull-right">
     <button class="btn btn-small" data-bind="click: function() { $root.showPluginSettings(); }" title="{{ _('Plugin Configuration') }}"><i class="icon-wrench"></i></button>
@@ -76,13 +65,13 @@
     <div>
         <small>
             <a href="#" class="muted" onclick="$(this).children('i.toggle-arrow').toggleClass('icon-caret-right icon-caret-down').parent().parent().parent().next().slideToggle('fast')">
-                <i class="toggle-arrow icon-caret-right"></i> Using pip at "<span data-bind="text: pipCommand"></span>", Version <span data-bind="text: pipVersion"></span>
+                <i class="toggle-arrow icon-caret-right"></i> Using pip of "<span data-bind="text: pipPython"></span>", Version <span data-bind="text: pipVersion"></span>
             </a>
         </small>
     </div>
     <div class="hide">
         <small>
-            Installation directory: <span data-bind="text: pipInstallDir"></span> ("--user" flag: <span data-bind="text: pipUseUserString"></span>, sudo: <span data-bind="text: pipUseSudoString"></span>)<br />
+            Installation directory: <span data-bind="text: pipInstallDir"></span> ("--user" flag: <span data-bind="text: pipUseUserString"></span>)<br />
             Virtual environment: <span data-bind="text: pipVirtualEnvString"></span><br />
             <span data-bind="visible: pipAdditionalArgs">Additional Arguments: <span data-bind="text: pipAdditionalArgs"></span></span>
         </small>
@@ -110,7 +99,6 @@
     <div class="modal-body">
         {{ pluginmanager_printing() }}
         {{ pluginmanager_nopip() }}
-        {{ pluginmanager_sudopip() }}
         <h4 style="position: relative">
             {{ _('... from the <a href="%(url)s" target="_blank">Plugin Repository</a>', url='http://plugins.octoprint.org') }}
             <div class="dropdown pull-right">