mirror of
https://github.com/javalsai/lidm.git
synced 2025-07-05 23:38:43 +02:00
feat: help, version menu
This commit is contained in:
parent
92d3351292
commit
afd23657c0
5
Makefile
5
Makefile
@ -8,11 +8,12 @@ PREFIX=/usr
|
|||||||
CC?=gcc
|
CC?=gcc
|
||||||
CFLAGS?=-O3 -Wall
|
CFLAGS?=-O3 -Wall
|
||||||
_CFLAGS=-I$(DIR)
|
_CFLAGS=-I$(DIR)
|
||||||
ALLFLAGS=$(CFLAGS) -I$(IDIR)
|
BUILD_FLAGS=-DLIDM_GIT_DESCRIPTION="\"$(shell git describe --long --tags || echo ?)\"" -DLIDM_BUILD_DATE="\"$(shell date -u +"%Y-%m-%dT%H:%M:%SZ" || echo ?)\""
|
||||||
|
ALLFLAGS=$(CFLAGS) -I$(IDIR) $(BUILD_FLAGS)
|
||||||
|
|
||||||
LIBS=-lpam
|
LIBS=-lpam
|
||||||
|
|
||||||
_DEPS = log.h util.h ui.h ui_state.h config.h desktop.h auth.h ofield.h efield.h keys.h users.h sessions.h chvt.h macros.h launch_state.h
|
_DEPS = version.h log.h util.h ui.h ui_state.h config.h desktop.h auth.h ofield.h efield.h keys.h users.h sessions.h chvt.h macros.h launch_state.h
|
||||||
DEPS = $(patsubst %,$(IDIR)/%,$(_DEPS))
|
DEPS = $(patsubst %,$(IDIR)/%,$(_DEPS))
|
||||||
|
|
||||||
_OBJ = main.o log.o util.o ui.o ui_state.o config.o desktop.o auth.o ofield.o efield.o users.o sessions.o chvt.o launch_state.o
|
_OBJ = main.o log.o util.o ui.o ui_state.o config.o desktop.o auth.o ofield.o efield.o users.o sessions.o chvt.o launch_state.o
|
||||||
|
9
include/version.h
Normal file
9
include/version.h
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
#ifndef LIDM_VERSION
|
||||||
|
#define LIDM_VERSION "v1.1.1"
|
||||||
|
#endif
|
||||||
|
#ifndef LIDM_GIT_DESCRIPTION
|
||||||
|
#define LIDM_GIT_DESCRIPTION "?"
|
||||||
|
#endif
|
||||||
|
#ifndef LIDM_BUILD_DATE
|
||||||
|
#define LIDM_BUILD_DATE "?"
|
||||||
|
#endif
|
21
src/main.c
21
src/main.c
@ -1,6 +1,7 @@
|
|||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
@ -12,6 +13,7 @@
|
|||||||
#include "ui.h"
|
#include "ui.h"
|
||||||
#include "users.h"
|
#include "users.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
#include "version.h"
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
// Logger
|
// Logger
|
||||||
@ -27,8 +29,23 @@ int main(int argc, char* argv[]) {
|
|||||||
log_init(log_fd);
|
log_init(log_fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Chvt
|
if (argc == 2) {
|
||||||
if (argc == 2) chvt_str(argv[1]);
|
if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0) {
|
||||||
|
printf("lidm version %s (git %s, build date %s)\n", LIDM_VERSION,
|
||||||
|
LIDM_GIT_DESCRIPTION, LIDM_BUILD_DATE);
|
||||||
|
return 0;
|
||||||
|
} else if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0) {
|
||||||
|
printf(
|
||||||
|
"Usage: lidm [vt number]\n"
|
||||||
|
"Options:\n"
|
||||||
|
" -h, --help Display help menu\n"
|
||||||
|
" -v, --version Display version information\n");
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
// Chvt
|
||||||
|
chvt_str(argv[1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
struct config config = DEFAULT_CONFIG;
|
struct config config = DEFAULT_CONFIG;
|
||||||
char* conf_override = getenv("LIDM_CONF");
|
char* conf_override = getenv("LIDM_CONF");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user