diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-16 00:08:00 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-16 00:09:16 +1000 |
commit | e64463219838b10bcae3a97998e5f7fe5b09298e (patch) | |
tree | 5d689f2054361f6f4383526977900b880ea3e6c8 | |
parent | Merge pull request #2838 from RyanDwyer/compositor-unavailable-crash (diff) | |
download | sway-e64463219838b10bcae3a97998e5f7fe5b09298e.tar.gz sway-e64463219838b10bcae3a97998e5f7fe5b09298e.tar.zst sway-e64463219838b10bcae3a97998e5f7fe5b09298e.zip |
Fix swaylock version string
The referenced constants were not defined so it always printed "version
unknown".
Also it would exit with code 1. It now exits with code 0.
-rw-r--r-- | swaylock/main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/swaylock/main.c b/swaylock/main.c index 04c0bb07..86dfd577 100644 --- a/swaylock/main.c +++ b/swaylock/main.c | |||
@@ -634,13 +634,9 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state, | |||
634 | } | 634 | } |
635 | break; | 635 | break; |
636 | case 'v': | 636 | case 'v': |
637 | #if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE | 637 | fprintf(stdout, "swaylock version " SWAY_VERSION "\n"); |
638 | fprintf(stdout, "swaylock version %s (%s, branch \"%s\")\n", | 638 | exit(EXIT_SUCCESS); |
639 | SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH); | 639 | break; |
640 | #else | ||
641 | fprintf(stdout, "version unknown\n"); | ||
642 | #endif | ||
643 | return 1; | ||
644 | case LO_BS_HL_COLOR: | 640 | case LO_BS_HL_COLOR: |
645 | if (state) { | 641 | if (state) { |
646 | state->args.colors.bs_highlight = parse_color(optarg); | 642 | state->args.colors.bs_highlight = parse_color(optarg); |