From 99d7546ca440af62bbe7719883873aef9e7d78d9 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 6 May 2018 22:43:46 +0200 Subject: [PATCH] @micolous changes CHG: - Make all examples platform-specific CHG: - Remove ModemManager rant on non-Linux platforms Ref: https://github.com/micolous/proxmark3/commit/e2aa5eb47c7f6adaf4bfa6d5de031c3c594763bf --- client/flasher.c | 4 +++- client/proxmark3.c | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/flasher.c b/client/flasher.c index 63af6144e..9ef87d0f2 100644 --- a/client/flasher.c +++ b/client/flasher.c @@ -91,11 +91,13 @@ static void usage(char *argv0) { fprintf(stdout, "\nExample (Linux):\n\n\t %s /dev/ttyACM0 armsrc/obj/fullimage.elf\n", argv0); fprintf(stdout, "\nExample (OSX :\n\n\t %s /dev/cu.usbmodem888 armsrc/obj/fullimage.elf\n", argv0); fprintf(stdout, "\nExample (WIN) :\n\n\t %s com3 armsrc/obj/fullimage.elf\n\n", argv0); +#ifdef __linux__ fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on ',\n"); fprintf(stdout, " you need to blacklist proxmark for modem-manager - see wiki for more details:\n\n"); fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n\n"); fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n\n"); - fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/OSX\n\n"); + fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/OSX\n\n"); +#endif } int main(int argc, char **argv) { diff --git a/client/proxmark3.c b/client/proxmark3.c index 6e668fbaf..48f3d7b3e 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -345,8 +345,7 @@ static void set_my_executable_path(void) { static void show_help(bool showFullHelp, char *command_line){ PrintAndLogEx(NORMAL, "syntax: %s [-h|-help|-m|-f|-flush|-w|-wait|-c|-command|-l|-lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line); - PrintAndLogEx(NORMAL, "\tLinux example:'%s /dev/ttyACM0'\n", command_line); - PrintAndLogEx(NORMAL, "\tWindows example:'%s com3'\n\n", command_line); + PrintAndLogEx(NORMAL, "\texample:'%s "SERIAL_PORT_H"'\n\n", command_line); if (showFullHelp){ PrintAndLogEx(NORMAL, "help: <-h|-help> Dump all interactive command's help at once.\n");