saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Also include salt-run in the packaged scripts

Browse source
This commit is contained in:
Pedro Algarvio 2014-10-01 21:00:10 +01:00
parent ec09c5b837
commit 5afb59090d
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
setup.py
View file

@ -336,6 +336,7 @@ class CloudSdist(Sdist):
if not filename.startswith('scripts/'):
continue
if filename not in ('scripts/salt-ssh',
'scripts/salt-run',
'scripts/salt-cloud'):
self.filelist.files.pop(
self.filelist.files.index(filename)
@ -689,6 +690,7 @@ if IS_WINDOWS_PLATFORM is False:
if PACKAGED_FOR_SALT_SSH:
SETUP_KWARGS['data_files'][0][1].extend([
'doc/man/salt-ssh.1',
'doc/man/salt-run.1',
'doc/man/salt-cloud.1',
])
else:
@ -812,8 +814,9 @@ if WITH_SETUPTOOLS:
if IS_WINDOWS_PLATFORM is False:
if PACKAGED_FOR_SALT_SSH:
SETUP_KWARGS['entry_points'] = {'console_scripts': [
'salt-cloud = salt.scripts:salt_cloud',
'salt-ssh = salt.scripts:salt_ssh'
'salt-run = salt.scripts:salt_run',
'salt-cloud = salt.scripts:salt_cloud',
]}
else:
SETUP_KWARGS['entry_points']['console_scripts'].extend([
@ -838,15 +841,16 @@ if WITH_SETUPTOOLS:
# does not, apparently, break the build, so, let's have both
if PACKAGED_FOR_SALT_SSH is False:
SETUP_KWARGS['scripts'] = ['scripts/salt-call',
'scripts/salt-cp',
'scripts/salt-minion',
'scripts/salt-unity',
]
'scripts/salt-cp',
'scripts/salt-minion',
'scripts/salt-unity',
]
if IS_WINDOWS_PLATFORM is False:
if PACKAGED_FOR_SALT_SSH:
SETUP_KWARGS['scripts'] = [
'scripts/salt-ssh',
'scripts/salt-run',
'scripts/salt-cloud'
]
else: