snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmacpi: Rename acpi to wmacpi-cli.

Browse source 
To avoid conflict with acpiclient (http://sourceforge.net/projects/acpiclient/),
which also provides an executable binary named acpi, the acpi binary included
with wmacpi is being renamed to wmacpi-cli.

Based on the patch from Debian:
http://sources.debian.net/src/wmacpi/2.2~rc5%2Bds-1/debian/patches/rename_acpi_to_wmacpi-cli.patch/
This commit is contained in:
Doug Torrance 2014-08-18 17:56:32 -05:00 committed by Carlos R. Mafra
parent 0165115fe9
commit ffffcb9241
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wmacpi/Makefile
View file

@ -22,8 +22,8 @@ targets := wmacpi
doc_targets := wmacpi.1 doc_targets := wmacpi.1
ifdef BUILD_CLI ifdef BUILD_CLI
targets += acpi targets += wmacpi-cli
doc_targets += acpi.1 doc_targets += wmacpi-cli.1
endif endif
PREFIX := /usr/local PREFIX := /usr/local
@ -42,11 +42,11 @@ wmacpi: $(WMOBJ)
# for the Debian package, we want to make building the command line tools # for the Debian package, we want to make building the command line tools
# optional. So, we hide all the necessary stuff here . . . # optional. So, we hide all the necessary stuff here . . .
ifdef BUILD_CLI ifdef BUILD_CLI
CLSRC := acpi.c libacpi.c CLSRC := wmacpi-cli.c libacpi.c
CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC))) CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC)))
-include $(CLOBJ:.o=.d) -include $(CLOBJ:.o=.d)
acpi: $(CLOBJ) wmacpi-cli: $(CLOBJ)
$(CC) $(LDFLAGS) -o $@ $^ $(CC) $(LDFLAGS) -o $@ $^
endif endif

0
wmacpi/acpi.1 → wmacpi/wmacpi-cli.1
View file

2
wmacpi/acpi.c → wmacpi/wmacpi-cli.c
View file

@ -45,7 +45,7 @@ void usage(char *name)
void print_version(void) void print_version(void)
{ {
printf("acpi version %s\n", ACPI_VER); printf("wmacpi-cli version %s\n", ACPI_VER);
printf(" Using libacpi version %s\n", LIBACPI_VER); printf(" Using libacpi version %s\n", LIBACPI_VER);
} }

11
wmacpi/wmacpi.1
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
wmacpi \- Battery status monitor for systems supporting ACPI wmacpi \- Battery status monitor for systems supporting ACPI
.SH NAME .SH NAME
acpi \- Query battery status for systems supporting ACPI wmacpi-cli \- Query battery status for systems supporting ACPI
.SH SYNOPSIS .SH SYNOPSIS
.B wmacpi .B wmacpi
[ [
@ -39,7 +39,7 @@ samples ]
.RI -h .RI -h
] ]
.PP .PP
.B acpi .B wmacpi-cli
[ [
.RI -a .RI -a
samples ] samples ]
@ -77,7 +77,7 @@ and a scrolling message with some hopefully useful information.
Clicking on the window cycles through the batteries that the ACPI Clicking on the window cycles through the batteries that the ACPI
system knows about. system knows about.
.PP .PP
.B acpi .B wmacpi-cli
queries the battery status from the command line. It prints the power queries the battery status from the command line. It prints the power
status, the percentage remaining for each battery found, and the time status, the percentage remaining for each battery found, and the time
remaining if the system is on battery, or the time remaining for each remaining if the system is on battery, or the time remaining for each
@ -115,8 +115,7 @@ rate.
.TP .TP
.B \-x, --cmdline .B \-x, --cmdline
Run wmacpi in command line mode - this operates identically to Run wmacpi in command line mode - this operates identically to
.B acpi .B wmacpi-cli\&.
..
.TP .TP
.B \-a, --samples=samples .B \-a, --samples=samples
Average the time remaining over num samples. This greatly improves the Average the time remaining over num samples. This greatly improves the
@ -136,7 +135,7 @@ Disable scrolling message.
.B \-h, --help .B \-h, --help
Display help. Display help.
.TP .TP
.B acpi .B wmacpi-cli
.TP .TP
.B \-a num .B \-a num
Average the time remaining over num samples. This greatly improves the Average the time remaining over num samples. This greatly improves the