aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/opennap/files/opennap.sh7
-rw-r--r--databases/msql/files/msql2.sh5
-rw-r--r--databases/msql3/files/msql2.sh5
-rw-r--r--emulators/vmware-guestd/files/vmware-guestd.sh3
-rw-r--r--emulators/vmware-guestd3/files/vmware-guestd.sh3
-rw-r--r--emulators/vmware-guestd4/files/vmware-guestd.sh3
-rw-r--r--emulators/vmware-guestd4/files/vmware-guestd.sh.in3
-rw-r--r--emulators/vmware-guestd5/files/vmware-guestd.sh3
-rw-r--r--emulators/vmware-guestd5/files/vmware-guestd.sh.in3
-rw-r--r--emulators/vmware-guestd6/files/vmware-guestd.sh3
-rw-r--r--emulators/vmware-guestd6/files/vmware-guestd.sh.in3
-rw-r--r--games/fsgs/files/fsgs.sh6
-rw-r--r--games/uox3/files/uox3.sh9
-rw-r--r--net-p2p/opennap/files/opennap.sh7
-rw-r--r--net/rtsp_proxy/files/rtsp_proxy.sh5
-rw-r--r--net/rwhois/files/rwhoisd.sh2
-rw-r--r--net/rwhoisd/files/rwhoisd.sh2
-rw-r--r--security/cyrus-sasl/files/pwcheck.sh3
18 files changed, 52 insertions, 23 deletions
diff --git a/audio/opennap/files/opennap.sh b/audio/opennap/files/opennap.sh
index 05e21d30b233..ecf5937fc025 100644
--- a/audio/opennap/files/opennap.sh
+++ b/audio/opennap/files/opennap.sh
@@ -7,10 +7,13 @@ fi
case "$1" in
start)
- [ -x ${PREFIX}/sbin/opennap ] && ${PREFIX}/sbin/opennap > /dev/null 2>&1 & && echo -n ' opennap'
+ if [ -x ${PREFIX}/sbin/opennap ]; then
+ ${PREFIX}/sbin/opennap > /dev/null 2>&1 &
+ echo -n ' opennap'
+ fi
;;
stop)
- [ -r ${PREFIX}/share/opennap/pid ] && kill -15 `cat ${PREFIX}/share/opennap/pid` > /dev/null && rm -f ${PREFIX}/share/opennap/pid &&echo -n ' opennap'
+ [ -r ${PREFIX}/share/opennap/pid ] && kill -15 `cat ${PREFIX}/share/opennap/pid` > /dev/null && rm -f ${PREFIX}/share/opennap/pid && echo -n ' opennap'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/databases/msql/files/msql2.sh b/databases/msql/files/msql2.sh
index 54e0e7762406..9d2d6f3e9500 100644
--- a/databases/msql/files/msql2.sh
+++ b/databases/msql/files/msql2.sh
@@ -7,7 +7,10 @@ fi
case "$1" in
start)
- [ -x ${PREFIX}/sbin/msql2d ] && su -f -l msql -c "exec ${PREFIX}/sbin/msql2d" > /dev/null 2>&1 & && echo -n ' msql2'
+ if [ -x ${PREFIX}/sbin/msql2d ]; then
+ su -f -l msql -c "exec ${PREFIX}/sbin/msql2d" > /dev/null 2>&1 &
+ echo -n ' msql2'
+ fi
;;
stop)
killall msql2d && echo -n ' msql2d' && rm -f ${PREFIX}/etc/msql2/msql2d.pid
diff --git a/databases/msql3/files/msql2.sh b/databases/msql3/files/msql2.sh
index 54e0e7762406..9d2d6f3e9500 100644
--- a/databases/msql3/files/msql2.sh
+++ b/databases/msql3/files/msql2.sh
@@ -7,7 +7,10 @@ fi
case "$1" in
start)
- [ -x ${PREFIX}/sbin/msql2d ] && su -f -l msql -c "exec ${PREFIX}/sbin/msql2d" > /dev/null 2>&1 & && echo -n ' msql2'
+ if [ -x ${PREFIX}/sbin/msql2d ]; then
+ su -f -l msql -c "exec ${PREFIX}/sbin/msql2d" > /dev/null 2>&1 &
+ echo -n ' msql2'
+ fi
;;
stop)
killall msql2d && echo -n ' msql2d' && rm -f ${PREFIX}/etc/msql2/msql2d.pid
diff --git a/emulators/vmware-guestd/files/vmware-guestd.sh b/emulators/vmware-guestd/files/vmware-guestd.sh
index c8759cb4ace3..10f0e0e5e31d 100644
--- a/emulators/vmware-guestd/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd/files/vmware-guestd.sh
@@ -10,7 +10,8 @@ start)
exec 2>/dev/null
ulimit -c 0
if ${PREFIX}/sbin/checkvm >/dev/null; then
- ${PREFIX}/sbin/vmware-guestd & && echo -n ' vmware-guestd'
+ ${PREFIX}/sbin/vmware-guestd &
+ echo -n ' vmware-guestd'
fi
;;
stop)
diff --git a/emulators/vmware-guestd3/files/vmware-guestd.sh b/emulators/vmware-guestd3/files/vmware-guestd.sh
index c8759cb4ace3..10f0e0e5e31d 100644
--- a/emulators/vmware-guestd3/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd3/files/vmware-guestd.sh
@@ -10,7 +10,8 @@ start)
exec 2>/dev/null
ulimit -c 0
if ${PREFIX}/sbin/checkvm >/dev/null; then
- ${PREFIX}/sbin/vmware-guestd & && echo -n ' vmware-guestd'
+ ${PREFIX}/sbin/vmware-guestd &
+ echo -n ' vmware-guestd'
fi
;;
stop)
diff --git a/emulators/vmware-guestd4/files/vmware-guestd.sh b/emulators/vmware-guestd4/files/vmware-guestd.sh
index c8759cb4ace3..10f0e0e5e31d 100644
--- a/emulators/vmware-guestd4/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd4/files/vmware-guestd.sh
@@ -10,7 +10,8 @@ start)
exec 2>/dev/null
ulimit -c 0
if ${PREFIX}/sbin/checkvm >/dev/null; then
- ${PREFIX}/sbin/vmware-guestd & && echo -n ' vmware-guestd'
+ ${PREFIX}/sbin/vmware-guestd &
+ echo -n ' vmware-guestd'
fi
;;
stop)
diff --git a/emulators/vmware-guestd4/files/vmware-guestd.sh.in b/emulators/vmware-guestd4/files/vmware-guestd.sh.in
index c8759cb4ace3..10f0e0e5e31d 100644
--- a/emulators/vmware-guestd4/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd4/files/vmware-guestd.sh.in
@@ -10,7 +10,8 @@ start)
exec 2>/dev/null
ulimit -c 0
if ${PREFIX}/sbin/checkvm >/dev/null; then
- ${PREFIX}/sbin/vmware-guestd & && echo -n ' vmware-guestd'
+ ${PREFIX}/sbin/vmware-guestd &
+ echo -n ' vmware-guestd'
fi
;;
stop)
diff --git a/emulators/vmware-guestd5/files/vmware-guestd.sh b/emulators/vmware-guestd5/files/vmware-guestd.sh
index c8759cb4ace3..10f0e0e5e31d 100644
--- a/emulators/vmware-guestd5/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd5/files/vmware-guestd.sh
@@ -10,7 +10,8 @@ start)
exec 2>/dev/null
ulimit -c 0
if ${PREFIX}/sbin/checkvm >/dev/null; then
- ${PREFIX}/sbin/vmware-guestd & && echo -n ' vmware-guestd'
+ ${PREFIX}/sbin/vmware-guestd &
+ echo -n ' vmware-guestd'
fi
;;
stop)
diff --git a/emulators/vmware-guestd5/files/vmware-guestd.sh.in b/emulators/vmware-guestd5/files/vmware-guestd.sh.in
index c8759cb4ace3..10f0e0e5e31d 100644
--- a/emulators/vmware-guestd5/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd5/files/vmware-guestd.sh.in
@@ -10,7 +10,8 @@ start)
exec 2>/dev/null
ulimit -c 0
if ${PREFIX}/sbin/checkvm >/dev/null; then
- ${PREFIX}/sbin/vmware-guestd & && echo -n ' vmware-guestd'
+ ${PREFIX}/sbin/vmware-guestd &
+ echo -n ' vmware-guestd'
fi
;;
stop)
diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh b/emulators/vmware-guestd6/files/vmware-guestd.sh
index c8759cb4ace3..10f0e0e5e31d 100644
--- a/emulators/vmware-guestd6/files/vmware-guestd.sh
+++ b/emulators/vmware-guestd6/files/vmware-guestd.sh
@@ -10,7 +10,8 @@ start)
exec 2>/dev/null
ulimit -c 0
if ${PREFIX}/sbin/checkvm >/dev/null; then
- ${PREFIX}/sbin/vmware-guestd & && echo -n ' vmware-guestd'
+ ${PREFIX}/sbin/vmware-guestd &
+ echo -n ' vmware-guestd'
fi
;;
stop)
diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh.in b/emulators/vmware-guestd6/files/vmware-guestd.sh.in
index c8759cb4ace3..10f0e0e5e31d 100644
--- a/emulators/vmware-guestd6/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd6/files/vmware-guestd.sh.in
@@ -10,7 +10,8 @@ start)
exec 2>/dev/null
ulimit -c 0
if ${PREFIX}/sbin/checkvm >/dev/null; then
- ${PREFIX}/sbin/vmware-guestd & && echo -n ' vmware-guestd'
+ ${PREFIX}/sbin/vmware-guestd &
+ echo -n ' vmware-guestd'
fi
;;
stop)
diff --git a/games/fsgs/files/fsgs.sh b/games/fsgs/files/fsgs.sh
index 0baeafa5509b..aec504082670 100644
--- a/games/fsgs/files/fsgs.sh
+++ b/games/fsgs/files/fsgs.sh
@@ -7,7 +7,11 @@ fi
case "$1" in
start)
- cd ${PREFIX}; [ -x fsgs/fsgs -a -f fsgs/fsgs.cfg ] && fsgs/fsgs > /dev/null & && echo -n ' fsgs'
+ cd ${PREFIX}
+ if [ -x fsgs/fsgs -a -f fsgs/fsgs.cfg ]; then
+ fsgs/fsgs > /dev/null &
+ echo -n ' fsgs'
+ fi
;;
stop)
killall fsgs && echo -n ' fsgs'
diff --git a/games/uox3/files/uox3.sh b/games/uox3/files/uox3.sh
index 47e05f569fa7..90978e9a0c61 100644
--- a/games/uox3/files/uox3.sh
+++ b/games/uox3/files/uox3.sh
@@ -4,11 +4,12 @@ uox3dir=/usr/local/uox3
case "$1" in
start)
- [ -x ${uox3dir}/uox3 ] && \
- cd ${uox3dir} && \
- uox3 > ${uox3dir}/stdout.log & && \
+ if [ -x ${uox3dir}/uox3 ]; then
+ cd ${uox3dir}
+ uox3 > ${uox3dir}/stdout.log &
echo -n ' uox3'
- ;;
+ fi
+ ;;
stop)
killall uox3 && echo -n ' uox3'
;;
diff --git a/net-p2p/opennap/files/opennap.sh b/net-p2p/opennap/files/opennap.sh
index 05e21d30b233..ecf5937fc025 100644
--- a/net-p2p/opennap/files/opennap.sh
+++ b/net-p2p/opennap/files/opennap.sh
@@ -7,10 +7,13 @@ fi
case "$1" in
start)
- [ -x ${PREFIX}/sbin/opennap ] && ${PREFIX}/sbin/opennap > /dev/null 2>&1 & && echo -n ' opennap'
+ if [ -x ${PREFIX}/sbin/opennap ]; then
+ ${PREFIX}/sbin/opennap > /dev/null 2>&1 &
+ echo -n ' opennap'
+ fi
;;
stop)
- [ -r ${PREFIX}/share/opennap/pid ] && kill -15 `cat ${PREFIX}/share/opennap/pid` > /dev/null && rm -f ${PREFIX}/share/opennap/pid &&echo -n ' opennap'
+ [ -r ${PREFIX}/share/opennap/pid ] && kill -15 `cat ${PREFIX}/share/opennap/pid` > /dev/null && rm -f ${PREFIX}/share/opennap/pid && echo -n ' opennap'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/net/rtsp_proxy/files/rtsp_proxy.sh b/net/rtsp_proxy/files/rtsp_proxy.sh
index 8176b0d60d07..c4f75a5cbf03 100644
--- a/net/rtsp_proxy/files/rtsp_proxy.sh
+++ b/net/rtsp_proxy/files/rtsp_proxy.sh
@@ -9,7 +9,10 @@ case $1 in
RTSP_PROXY=${PREFIX}/sbin/rtsp_proxy
CONFIG_FILE=${PREFIX}/etc/qts_proxy.conf
PID_FILE=/var/run/rtsp_proxy.pid
- [ -x ${RTSP_PROXY} ] && ${RTSP_PROXY} -c ${CONFIG_FILE} > /dev/null & && echo $! > ${PID_FILE}
+ if [ -x ${RTSP_PROXY} ]; then
+ ${RTSP_PROXY} -c ${CONFIG_FILE} > /dev/null &
+ echo $! > ${PID_FILE}
+ fi
;;
stop) if [ -f /var/run/rtsp_proxy.pid ]; then
kill `cat /var/run/rtsp_proxy.pid`
diff --git a/net/rwhois/files/rwhoisd.sh b/net/rwhois/files/rwhoisd.sh
index 878e8877aa44..cc977b591234 100644
--- a/net/rwhois/files/rwhoisd.sh
+++ b/net/rwhois/files/rwhoisd.sh
@@ -10,7 +10,7 @@ start)
# remove or comment the following line and uncomment the one below it once you have
# configured your server's data
echo "rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details."
- #[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhoisd.conf & && echo -n ' rwhoisd'
+ #if [ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ]; then (${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhoisd.conf &); echo -n ' rwhoisd'; fi
;;
stop)
# killall rwhoisd && echo -n ' rwhoisd
diff --git a/net/rwhoisd/files/rwhoisd.sh b/net/rwhoisd/files/rwhoisd.sh
index 878e8877aa44..cc977b591234 100644
--- a/net/rwhoisd/files/rwhoisd.sh
+++ b/net/rwhoisd/files/rwhoisd.sh
@@ -10,7 +10,7 @@ start)
# remove or comment the following line and uncomment the one below it once you have
# configured your server's data
echo "rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details."
- #[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhoisd.conf & && echo -n ' rwhoisd'
+ #if [ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ]; then (${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhoisd.conf &); echo -n ' rwhoisd'; fi
;;
stop)
# killall rwhoisd && echo -n ' rwhoisd
diff --git a/security/cyrus-sasl/files/pwcheck.sh b/security/cyrus-sasl/files/pwcheck.sh
index 3f4c903817a2..faca0910847b 100644
--- a/security/cyrus-sasl/files/pwcheck.sh
+++ b/security/cyrus-sasl/files/pwcheck.sh
@@ -41,7 +41,8 @@ case "${sasl_pwcheck_enable}" in
start)
if [ -x ${sasl_pwcheck_program} ] ; then
- ${sasl_pwcheck_program} & && echo -n " pwcheck"
+ ${sasl_pwcheck_program} &
+ echo -n " pwcheck"
fi
;;