Land #401, Bundle pip in Windows frozen builds

rsmusllp · Sep 20, 2019 · 18b17e6 · 18b17e6
2 parents 0b3be4f + 097a898
commit 18b17e6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/king_phisher/client/windows/plugin_manager.py b/king_phisher/client/windows/plugin_manager.py
@@ -38,9 +38,7 @@
 import os
 import sys
 import traceback
-import xml.sax.saxutils as saxutils
 
-from king_phisher import startup
 from king_phisher import utilities
 from king_phisher.catalog import Catalog
 from king_phisher.client import plugins

diff --git a/king_phisher/plugins.py b/king_phisher/plugins.py
@@ -623,11 +623,15 @@ def install_packages(self, packages):
 		:return: The process results from the command execution.
 		:rtype: :py:class:`~.ProcessResults`
 		"""
-		options = []
+		pip_options = []
 		if self.library_path is None:
 			raise errors.KingPhisherResourceError('missing plugin-specific library path')
-		options.extend(['--target', self.library_path])
-		args = [sys.executable, '-m', 'pip', 'install'] + options + packages
+		pip_options.extend(['--target', self.library_path])
+		if its.frozen:
+			args = [os.path.join(os.path.dirname(sys.executable), 'python.exe')]
+		else:
+			args = [sys.executable] + pip_options + packages
+		args += ['-m', 'pip', 'install'] + pip_options + packages
 		if len(packages) > 1:
 			info_string = "installing packages: {}"
 		else:

diff --git a/tools/development/cx_freeze.py b/tools/development/cx_freeze.py
@@ -30,6 +30,7 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+import collections
 import os
 import site
 import sys
@@ -133,6 +134,12 @@
 include_files.append(('data/king_phisher', 'king_phisher'))
 include_files.append((pytz.__path__[0], 'pytz'))
 include_files.append((requests.__path__[0], 'requests'))
+include_files.append((collections.__path__[0], 'collections'))
+
+# include pip executible
+executable_path = os.path.dirname(sys.executable)
+include_files.append((os.path.join(executable_path, 'Scripts'), 'Scripts'))
+include_files.append((os.path.join(executable_path, 'python.exe'), 'python.exe'))
 
 exe_base = 'Win32GUI'
 if is_debugging_build:
@@ -157,6 +164,7 @@
 		'cffi',
 		'collections',
 		'cryptography',
+		'distutils',
 		'dns',
 		'email',
 		'email_validator',
@@ -177,6 +185,10 @@
 		'numpy',
 		'paramiko',
 		'pil',
+		'pip',
+		'os',
+		'six',
+		'sys',
 		'pkg_resources',
 		'pluginbase',
 		'qrcode',