Skip to content

Commit

Permalink
Make naming a bit more consistent across everything
Browse files Browse the repository at this point in the history
  • Loading branch information
guruthree committed Jul 5, 2014
1 parent 1874541 commit 0eb506e
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 26 deletions.
16 changes: 8 additions & 8 deletions simbamon/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Makefile for SimBaMon
# Makefile for simbamon
# This code is copyright Hamish Cunningham and the University of Sheffield
# and is licenced under GPL 3 or any later version.

Expand Down Expand Up @@ -44,10 +44,10 @@ do-listing=\

# help #######################################################################
help:
@echo 'Makefile for SimBaMon '
@echo 'Makefile for simbamon '
@echo ' '
@echo 'Usage: '
@echo ' make install installs the SimBaMon daemon'
@echo ' make install installs the simbamon daemon'
@echo ' make uninstall removes the daemon '
@echo ' make list list installed files '
@echo ' make package create .deb/.dcs packagings '
Expand Down Expand Up @@ -83,12 +83,12 @@ install:
install man/$(MOPICLI).8.gz $(DESTDIR)/usr/share/man/man8
install man/$(MOPIAPI).8.gz $(DESTDIR)/usr/share/man/man8
[ -z "$(DESTDIR)" ] && update-rc.d $(P) defaults || :
@echo 'SimBaMon installed: '
@echo 'simbamon installed: '
@$(do-listing)

# uninstall ##################################################################
uninstall:
@echo 'removing SimBaMon files: '
@echo 'removing simbamon files: '
@$(do-listing)
[ -z "$(DESTDIR)" ] && update-rc.d -f $(P) remove || :
sudo rm -f $(INSTALLED_FILES)
Expand Down Expand Up @@ -120,7 +120,7 @@ package: version man package-unstable package-precise
@echo "\nprecise:"
@ls -lh $(PD)/precise
package-unstable:
@echo 'packaging SimBaMon for Debian unstable...'
@echo 'packaging simbamon for Debian unstable...'
mkdir -p $(PD)/unstable
rm -f $(PD)/unstable/*
sed -i \
Expand All @@ -130,7 +130,7 @@ package-unstable:
cd .. && for f in $(PACKAGE_FILES); do \
[ -f $$f ] && mv $$f $(D)/$(PD)/unstable || :; done
package-precise:
@echo 'packaging SimBaMon for Ubuntu precise...'
@echo 'packaging simbamon for Ubuntu precise...'
mkdir -p $(PD)/precise
rm -f $(PD)/precise/*
sed -i 's,\(^$(P) ('$(VERSION)') \)[a-z]*,\1precise,' debian/changelog
Expand All @@ -145,7 +145,7 @@ snapshot-version:
sed -i 's,^VERSION=.*,VERSION=\"'$(SNAPSHOT_VERSION)'\",' $$f; done
sed -i 's,^NEXT_SNAP=.*,NEXT_SNAP='$$(($(NEXT_SNAP) + 1))',' Makefile
snapshot: snapshot-version
@echo "packaging SimBaMon SNAPSHOT $(SNAPSHOT)..."
@echo "packaging simbamon SNAPSHOT $(SNAPSHOT)..."
mkdir -p $(SNAPD)
rm -rf $(SNAPD)/*
sed -i -e 's,\(^$(P) ('$(VERSION)') \)[a-z]*,\1precise,' \
Expand Down
2 changes: 1 addition & 1 deletion simbamon/README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SimBaMon: a Simple Battery Monitor daemon
simbamon: a Simple Battery Monitor daemon

-----------------------------------------------------------------------------
This tree contains the code for a simple battery monitor daemon for projects
Expand Down
4 changes: 2 additions & 2 deletions simbamon/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Package: simbamond
Architecture: all
Depends: python-rpi.gpio, python-smbus, whiptail, bc, ${misc:Depends}
Recommends:
Description: SimBaMon, a Simple Battery Monitor
SimBaMon is an open source Linux daemon for monitoring battery levels;
Description: simbamon, a Simple Battery Monitor
simbamon is an open source Linux daemon for monitoring battery levels;
sending warning messages to the user if the battery is low; shutting down
cleanly at critical battery levels; managing a power supply on/off switch;
writing relevant data to the system logs. It is bundled with configuration
Expand Down
4 changes: 2 additions & 2 deletions simbamon/man/simbamond.8
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
.SH DESCRIPTION
Battery monitoring for the Raspberry Pi\.\.\.
.PP
SimBaMon is an open source Linux daemon for
simbamon is an open source Linux daemon for
.RS
.IP \(bu 3
monitoring battery levels
Expand Down Expand Up @@ -45,7 +45,7 @@ Linux uses to manage daemons (amongst other things)
.RE
.PP
The last of these, \fIsimbamond\fP, is used by the operating system to start and
stop SimBaMon at boot or shutdown time, and can be used to control the daemon
stop simbamon at boot or shutdown time, and can be used to control the daemon
manually when required. For example this command will stop the daemon:
.PP
.nf
Expand Down
Binary file modified simbamon/man/simbamond.8.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions simbamon/man/simbamond.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SYNOPSIS
DESCRIPTION
Battery monitoring for the Raspberry Pi...

SimBaMon is an open source Linux daemon for
simbamon is an open source Linux daemon for

- monitoring battery levels
- sending warning messages to the user if the battery is low
Expand All @@ -25,7 +25,7 @@ DESCRIPTION
Linux uses to manage daemons (amongst other things)

The last of these, simbamond, is used by the operating system to start and
stop SimBaMon at boot or shutdown time, and can be used to control the daemon
stop simbamon at boot or shutdown time, and can be used to control the daemon
manually when required. For example this command will stop the daemon:

sudo service simbamon stop
Expand Down
2 changes: 1 addition & 1 deletion simbamon/mopi
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ while true; do
"This will DELETE all local configuration -- are you sure?!" \
24 70 1 && \
delete_local_config ;;
7\ *) whiptail --title "SimBaMon Log Entries" --msgbox \
7\ *) whiptail --title "simbamon Log Entries" --msgbox \
"`do_log_grep`" $WT_HEIGHT $WT_WIDTH 1 ;;
8\ *) do_about ;;
*) whiptail --msgbox "Error: unrecognized option" 20 60 1 ;;
Expand Down
8 changes: 4 additions & 4 deletions simbamon/simbamon
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
### BEGIN INIT INFO
# Provides: simbamon
# Short-Description: SimBaMon: a simple battery monitor daemon
# Description: This script is implements the daemon for
# SimBaMon (a simple battery monitor)
# Short-Description: simbamon: a simple battery monitor daemon
# Description: This script checks battery level and
# reports it
### END INIT INFO

# standard locals
Expand All @@ -26,7 +26,7 @@ usage() { log_action_msg Usage: $USAGE; [ ! -z "$1" ] && exit $1; }

# defaults
PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
DESC="SimBaMon: a simple battery monitor daemon"
DESC="simbamon: a simple battery monitor daemon"
NAME=simbamon
DNAME=simbamond
DAEMON=/usr/sbin/$NAME
Expand Down
2 changes: 1 addition & 1 deletion simbamon/simbamond.default
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# simbamon.default
#
# Configuration variables for the SimBaMon simple battery monitor daemon.
# Configuration variables for the simbamon simple battery monitor daemon.
# This code is copyright Hamish Cunningham and the University of Sheffield
# and is licenced under GPL 3 or any later version.

Expand Down
10 changes: 5 additions & 5 deletions simbamon/simbamond.init
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# simbamond -- init interface to SimBaMon, a simple battery monitor
# simbamond -- init interface to simbamon, a simple battery monitor
#
# Author: Hamish Cunningham <hamish@gate.ac.uk>
# Derived from Ubuntu 12.04 /etc/init.d/skeleton, July 2013.
Expand All @@ -13,14 +13,14 @@
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: SimBaMon: a simple battery monitor daemon
# Description: This script is the init interface to SimBaMon
# (a simple battery monitor daemon)
# Short-Description: simbamond: a simple battery monitor daemon
# Description: This script is the init interface to simbamon
# (a simple battery monitor)
### END INIT INFO

# Defaults
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="SimBaMon: a simple battery monitor daemon"
DESC="simbamond: a simple battery monitor daemon"
NAME=simbamon
DNAME=simbamond
DAEMON=/usr/sbin/$NAME
Expand Down

0 comments on commit 0eb506e

Please sign in to comment.