Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix setup.sh/env.sh filename #1000

Merged
merged 1 commit into from
Mar 18, 2019
Merged

Fix setup.sh/env.sh filename #1000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions python/catkin/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ def build_cmake_package(
make_install_cmd = [last_env] + make_install_cmd
run_command(make_install_cmd, build_dir, quiet)

env_script = 'env' + '.bat' if sys.platform == 'win32' else '.sh'
env_script = 'env' + ('.bat' if sys.platform == 'win32' else '.sh')
# If an env script already exists, don't overwrite it
if install and os.path.exists(prefix_destdir(os.path.join(install_target, env_script), destdir)):
return
Expand All @@ -677,7 +677,7 @@ def build_cmake_package(

# Generate setup script for chaining to catkin packages
# except if using --merge which implies that new_setup_path equals last_setup_env
setup_script = 'setup' + '.bat' if sys.platform == 'win32' else '.sh'
setup_script = 'setup' + ('.bat' if sys.platform == 'win32' else '.sh')
new_setup_path = os.path.join(install_target, setup_script)
if install:
new_setup_path = prefix_destdir(new_setup_path, destdir)
Expand Down