From b332ce611bca5a37dca8c99441c21ac54e880ff3 Mon Sep 17 00:00:00 2001 From: Chris Guillott Date: Thu, 18 Feb 2016 12:54:35 -0500 Subject: [PATCH] update help/makefile/man page --- .gitignore | 1 + Makefile | 8 ++++++-- i3lock.1 => i3lock-color.1 | 8 ++++---- i3lock.c | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) rename i3lock.1 => i3lock-color.1 (96%) diff --git a/.gitignore b/.gitignore index 2c2ee33..5c2c5bd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ i3lock-color *.o tags *.swp +*.gz diff --git a/Makefile b/Makefile index e603aec..7d63e28 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ INSTALL=install PREFIX=/usr SYSCONFDIR=/etc PKG_CONFIG=pkg-config +MANDIR=/usr/share/man # Check if pkg-config is installed, we need it for building CFLAGS/LIBS ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null 1>/dev/null || echo 1),1) @@ -40,15 +41,18 @@ install: all $(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/pam.d $(INSTALL) -m 755 i3lock-color $(DESTDIR)$(PREFIX)/bin/i3lock-color $(INSTALL) -m 644 i3lock-color.pam $(DESTDIR)$(SYSCONFDIR)/pam.d/i3lock-color + gzip -kf i3lock-color.1 + $(INSTALL) -m 644 i3lock-color.1.gz $(MANDIR)/man1/i3lock-color.1.gz uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/i3lock-color + rm -f $(MANDIR)/man1/i3lock-color.1.gz dist: clean [ ! -d i3lock-color-${VERSION} ] || rm -rf i3lock-color-${VERSION} - [ ! -e i3lock-c-olor-${VERSION}.tar.bz2 ] || rm i3lock-color-${VERSION}.tar.bz2 + [ ! -e i3lock-color-${VERSION}.tar.bz2 ] || rm i3lock-color-${VERSION}.tar.bz2 mkdir i3lock-${VERSION} - cp *.c *.h i3lock.1 i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION} + cp *.c *.h i3lock-color.1.gz i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION} sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION:=$(shell /bin/echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile tar cfj i3lock-color-${VERSION}.tar.bz2 i3lock-color-${VERSION} rm -rf i3lock-color-${VERSION} diff --git a/i3lock.1 b/i3lock-color.1 similarity index 96% rename from i3lock.1 rename to i3lock-color.1 index aff08f3..211ed31 100644 --- a/i3lock.1 +++ b/i3lock-color.1 @@ -8,13 +8,13 @@ .fi .. -.TH i3lock 1 "JANUARY 2012" Linux "User Manuals" +.TH i3lock-color 1 "JANUARY 2012" Linux "User Manuals" .SH NAME -i3lock \- improved screen locker +i3lock-color \- improved screen locker .SH SYNOPSIS -.B i3lock +.B i3lock-color .RB [\|\-v\|] .RB [\|\-n\|] .RB [\|\-b\|] @@ -32,7 +32,7 @@ i3lock \- improved screen locker .RB [\|\-f\|] .SH DESCRIPTION -.B i3lock +.B i3lock-color is a simple screen locker like slock. After starting it, you will see a white screen (you can configure the color/an image). You can return to your screen by entering your password. diff --git a/i3lock.c b/i3lock.c index 8f0eb11..79cb439 100644 --- a/i3lock.c +++ b/i3lock.c @@ -990,7 +990,7 @@ int main(int argc, char *argv[]) { break; default: errx(EXIT_FAILURE, "Syntax: i3lock-color [-v] [-n] [-b] [-d] [-c color] [-u] [-p win|default]" - " [-i image.png] [-t] [-e] [-I timeout] [-f] [-r|s]"); + " [-i image.png] [-t] [-e] [-I timeout] [-f] [-r|s] [-S screen_number] [--fuckton-of-color-args=rrggbbaa]"); } }