# HG changeset patch # User souliane # Date 1405424376 -7200 # Node ID 636b6c477a8754eeccdc9a2e981e92a43e2f51d8 # Parent a7f5448a1bc34f1144c89c0f478985853a466f49 setup: tiny factorisation diff -r a7f5448a1bc3 -r 636b6c477a87 setup.py --- a/setup.py Mon Jul 14 13:06:24 2014 +0200 +++ b/setup.py Tue Jul 15 13:39:36 2014 +0200 @@ -102,7 +102,6 @@ """Create symbolic links to executables""" # the script which launch the daemon for source, dest in self.sh_script_links: - dest = os.path.join(self.install_scripts, dest) if os.path.islink(dest) and os.readlink(dest) != source: os.remove(dest) # copy_file doesn't force the link update dest_name, copied = copy_file(source, dest, link='sym') @@ -134,7 +133,7 @@ def run(self): self.sh_script_path = os.path.join(self.install_lib, NAME, 'libervia.sh') - self.sh_script_links = [(self.sh_script_path, LAUNCH_DAEMON_COMMAND)] + self.sh_script_links = [(self.sh_script_path, os.path.join(self.install_scripts, LAUNCH_DAEMON_COMMAND))] self.install_data_dir = os.path.join(self.install_data, 'share', NAME) self.pyjamas_output_dir = os.path.join(os.getcwd(), 'html') sys.stdout.write('running pre installation stuff\n') @@ -186,7 +185,6 @@ os.path.join(self.install_lib, "%s-py%s.egg-info" % (self.config_vars['dist_fullname'], self.config_vars['py_version_short'])), ]) for source, dest in self.sh_script_links: - dest = os.path.join(self.install_scripts, dest) if os.path.islink(dest): to_remove.append(dest) plugin_file = os.path.join(self.install_lib, 'twisted', 'plugins', NAME)