aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crystfel.rb2
-rw-r--r--src/indexamajig.c14
2 files changed, 15 insertions, 1 deletions
diff --git a/crystfel.rb b/crystfel.rb
index 21851fb7..9c4e72ab 100644
--- a/crystfel.rb
+++ b/crystfel.rb
@@ -58,7 +58,6 @@ class Crystfel < Formula
system bin / 'crystfel', '--help'
system bin / 'align_detector', '--help'
system bin / 'get_hkl', '--help'
- system bin / 'indexamajig', '--help'
system bin / 'list_events', '--help'
system bin / 'make_pixelmap', '--help'
system bin / 'partialator', '--help'
@@ -66,5 +65,6 @@ class Crystfel < Formula
system bin / 'process_hkl', '--help'
system bin / 'render_hkl', '--help'
system bin / 'whirligig', '--help'
+ # indexamajig --help crashes on MacOS due to argp-standalone bug
end
end
diff --git a/src/indexamajig.c b/src/indexamajig.c
index ce8b2cbf..aa0db210 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -1183,6 +1183,20 @@ int main(int argc, char *argv[])
{0}
};
+ #if defined(__APPLE__)
+ int q;
+ for ( q=0; q<argc; q++ ) {
+ if ( strcmp(argv[q], "--help") == 0 ) {
+ fprintf(stderr, "\n"
+ "WARNING: 'indexamajig --help' crashes on some Mac OS versions.\n"
+ "This is a known problem, and is due to a bug in external library "
+ "code.\n\n");
+ fflush(stderr);
+ break;
+ }
+ }
+ #endif
+
static struct argp argp = { options, parse_arg, NULL, doc,
argp_children, NULL, NULL };
if ( argp_parse(&argp, argc, argv, 0, NULL, &args) ) return 1;