Skip to content

Improve behaviour regarding "help" #509

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

Merged
sbc100 merged 2 commits into from
May 28, 2020
Merged

Improve behaviour regarding "help" #509

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd79e39
Also accept -h for help
orestisfl May 28, 2020
9891b0d
Do not exit with 1 when --help is used
orestisfl May 28, 2020
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
12 changes: 6 additions & 6 deletions emsdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2677,11 +2677,11 @@ def error_on_missing_tool(name):
def main():
global emscripten_config_directory, BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS, TTY_OUTPUT

if len(sys.argv) <= 1 or sys.argv[1] == 'help' or sys.argv[1] == '--help':
if len(sys.argv) <= 1:
print(' emsdk: No command given. Please call one of the following:')
else:
print(' emsdk: Available commands:')
if len(sys.argv) <= 1:
print("Missing command; Type 'emsdk help' to get a list of commands.")
return 1
if sys.argv[1] in ('help', '--help', '-h'):
print(' emsdk: Available commands:')

print('''
emsdk list [--old] [--uses] - Lists all available SDKs and tools and their
Expand Down Expand Up @@ -2798,7 +2798,7 @@ def main():
'activate' commands and the invocation of 'emsdk_env', or otherwise
these commands will default to operating on the default build type
which in and RelWithDebInfo.''')
return 1
return 0

# Extracts a boolean command line argument from sys.argv and returns True if it was present
def extract_bool_arg(name):
Expand Down