From 199f4f67ed81ef2f4fa3130bc6be0654e0d6dfd8 Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Mon, 26 Dec 2005 19:21:41 +0000 Subject: Make the install_scripts command respect the "build_scripts -e" option when installing generated scripts using the --single-version-externally-managed option. --HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041815 --- setuptools/command/install_scripts.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'setuptools/command/install_scripts.py') diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py index 601b66f3..66c08838 100755 --- a/setuptools/command/install_scripts.py +++ b/setuptools/command/install_scripts.py @@ -1,6 +1,6 @@ from distutils.command.install_scripts import install_scripts \ as _install_scripts -from easy_install import get_script_args +from easy_install import get_script_args, sys_executable from pkg_resources import Distribution, PathMetadata, ensure_directory import os from distutils import log @@ -19,12 +19,12 @@ class install_scripts(_install_scripts): ei_cmd.egg_base, PathMetadata(ei_cmd.egg_base, ei_cmd.egg_info), ei_cmd.egg_name, ei_cmd.egg_version, ) - for args in get_script_args(dist): - self.write_script(*args) + bs_cmd = self.get_finalized_command('build_scripts') + executable = getattr(bs_cmd,'executable',sys_executable) + for args in get_script_args(dist, executable): self.write_script(*args) def write_script(self, script_name, contents, mode="t", *ignored): """Write an executable file to the scripts directory""" - log.info("Installing %s script to %s", script_name, self.install_dir) target = os.path.join(self.install_dir, script_name) self.outfiles.append(target) -- cgit v1.2.3