aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-10-15 21:30:53 +0200
committerLibravatar GitHub <noreply@github.com>2018-10-15 21:30:53 +0200
commit4e4b922d794f4f27968275fa3e5b9245a80eede4 (patch)
tree5d689f2054361f6f4383526977900b880ea3e6c8
parentMerge pull request #2838 from RyanDwyer/compositor-unavailable-crash (diff)
parentFix swaylock version string (diff)
downloadsway-4e4b922d794f4f27968275fa3e5b9245a80eede4.tar.gz
sway-4e4b922d794f4f27968275fa3e5b9245a80eede4.tar.zst
sway-4e4b922d794f4f27968275fa3e5b9245a80eede4.zip
Merge pull request #2839 from RyanDwyer/swaylock-version
Fix swaylock version string
-rw-r--r--swaylock/main.c10
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);