git://git.onelab.eu
/
myplc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove inactive svn keyword
[myplc.git]
/
plc.d
/
functions
diff --git
a/plc.d/functions
b/plc.d/functions
index
5f52e10
..
3ca315b
100644
(file)
--- a/
plc.d/functions
+++ b/
plc.d/functions
@@
-1,7
+1,4
@@
# -*-Shell-script-*-
# -*-Shell-script-*-
-# $Id$
-# $URL$
-#
# Common functions for PLC startup/shutdown scripts
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Common functions for PLC startup/shutdown scripts
#
# Mark Huang <mlhuang@cs.princeton.edu>
@@
-17,20
+14,17
@@
export PATH=/sbin:/bin:/usr/bin:/usr/sbin
ERRORS=0
# Count the exit status of the last command
ERRORS=0
# Count the exit status of the last command
-check ()
-{
+function check () {
ERRORS=$(($ERRORS+$?))
}
# Print status header
ERRORS=$(($ERRORS+$?))
}
# Print status header
-dialog ()
-{
+function dialog () {
echo -n "PLC: $*: " >&3
}
# Print result
echo -n "PLC: $*: " >&3
}
# Print result
-result ()
-{
+function result () {
if [ $ERRORS -eq 0 ] ; then
success "$*" >&3
else
if [ $ERRORS -eq 0 ] ; then
success "$*" >&3
else
@@
-40,8
+34,7
@@
result ()
}
# Start up a program with a plc_ prefix
}
# Start up a program with a plc_ prefix
-plc_daemon ()
-{
+function plc_daemon () {
base=${1##*/}
# See if it's already running. Look *only* at the pid file.
base=${1##*/}
# See if it's already running. Look *only* at the pid file.
@@
-76,22
+69,19
@@
plc_daemon ()
}
# Print IP address of hostname if resolvable
}
# Print IP address of hostname if resolvable
-gethostbyname ()
-{
+function gethostbyname () {
python -c 'import socket; import sys; print socket.gethostbyname(sys.argv[1])' $1 2>/dev/null
}
# Forcefully make a symlink
python -c 'import socket; import sys; print socket.gethostbyname(sys.argv[1])' $1 2>/dev/null
}
# Forcefully make a symlink
-symlink ()
-{
+function symlink () {
mkdir -p $(dirname $2)
rm -f $2
ln -s $1 $2
}
# Argument(s) or stdin to lowercase stdout
mkdir -p $(dirname $2)
rm -f $2
ln -s $1 $2
}
# Argument(s) or stdin to lowercase stdout
-lower ()
-{
+function lower () {
if [ ${#*} -ge 1 ] ; then
tr A-Z a-z <<<$*
else
if [ ${#*} -ge 1 ] ; then
tr A-Z a-z <<<$*
else
@@
-100,8
+90,7
@@
lower ()
}
# Argument(s) or stdin to uppercase stdout
}
# Argument(s) or stdin to uppercase stdout
-upper ()
-{
+function upper () {
if [ ${#*} -ge 1 ] ; then
tr a-z A-Z <<<$*
else
if [ ${#*} -ge 1 ] ; then
tr a-z A-Z <<<$*
else
@@
-110,8
+99,7
@@
upper ()
}
# Regenerate configuration files
}
# Regenerate configuration files
-reload ()
-{
+function plc_reload () {
force=$1
# Regenerate the main configuration file from default values
force=$1
# Regenerate the main configuration file from default values