[Pkg-sysvinit-commits] r349 -
sysvinit/trunk/debian/initscripts/etc/init.d
Thomas Hood
jdthood-guest at costa.debian.org
Thu Dec 1 16:56:22 UTC 2005
Author: jdthood-guest
Date: 2005-12-01 16:56:21 +0000 (Thu, 01 Dec 2005)
New Revision: 349
Modified:
sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh
sysvinit/trunk/debian/initscripts/etc/init.d/killprocs
sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
sysvinit/trunk/debian/initscripts/etc/init.d/urandom
Log:
Use $(...) instead of old-fashioned `...` for the sake of consistency
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh 2005-12-01 16:56:21 UTC (rev 349)
@@ -60,7 +60,7 @@
! ( -path './...security*' -uid 0 )'
(
- if cd /tmp && [ "`find . -maxdepth 0 -perm -002`" = "." ]
+ if cd /tmp && [ "$(find . -maxdepth 0 -perm -002)" = "." ]
then
# First remove all old files...
find . -depth -xdev $TEXPR $EXCEPT \
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh 2005-12-01 16:56:21 UTC (rev 349)
@@ -40,7 +40,7 @@
# in the directory the link points to.
if [ "$EDITMOTD" != no ]
then
- MOTD="`readlink -f /etc/motd || :`"
+ MOTD="$(readlink -f /etc/motd || :)"
if [ "$MOTD" != "" ]
then
uname -snrvm > $MOTD.tmp
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh 2005-12-01 16:56:21 UTC (rev 349)
@@ -53,7 +53,7 @@
spinner=""
;;
esac
- [ `uname -m` = s390 ] && spinner="" # This should go away
+ [ "$(uname -m)" = s390 ] && spinner="" # This should go away
FSCKTYPES_OPT=""
[ "$FSCKTYPES" ] && FSCKTYPES_OPT="-t $FSCKTYPES"
handle_failed_fsck() {
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/hostname.sh 2005-12-01 16:56:21 UTC (rev 349)
@@ -12,10 +12,10 @@
. /lib/lsb/init-functions
do_start () {
- [ -f /etc/hostname ] && HOSTNAME=`cat /etc/hostname`
+ [ -f /etc/hostname ] && HOSTNAME="$(cat /etc/hostname)"
# Keep current name if /etc/hostname is missing.
- [ -z "$HOSTNAME" ] && HOSTNAME=`hostname`
+ [ -z "$HOSTNAME" ] && HOSTNAME="$(hostname)"
# And set it to 'localhost' if no setting was found
[ -z "$HOSTNAME" ] && HOSTNAME=localhost
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/killprocs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/killprocs 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/killprocs 2005-12-01 16:56:21 UTC (rev 349)
@@ -23,9 +23,9 @@
log_action_end_msg 0
# We start update here, since we just killed it.
- if [ -x /sbin/update ] && [ `uname -s` = Linux ]
+ if [ -x /sbin/update ] && [ "$(uname -s)" = Linux ]
then
- case `uname -r` in
+ case "$(uname -r)" in
0.*|1.*|2.[0123].*)
/sbin/update
;;
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh 2005-12-01 16:56:21 UTC (rev 349)
@@ -54,7 +54,7 @@
fi
fi
- case `uname -s` in
+ case "$(uname -s)" in
*FreeBSD)
INITCTL=/etc/.initctl
;;
@@ -79,7 +79,7 @@
# a file on a now mounted filesystem.
#
doswap=yes
- case "`uname -sr`" in
+ case "$(uname -sr)" in
Linux\ 2.[0123].*)
if grep -qs resync /proc/mdstat
then
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh 2005-12-01 16:56:21 UTC (rev 349)
@@ -74,7 +74,7 @@
exec 0>&1
if [ "$portmap" = yes ]
then
- if [ -x /sbin/portmap ] && [ -z "`pidof portmap`" ]
+ if [ -x /sbin/portmap ] && [ -z "$(pidof portmap)" ]
then
if [ -x /etc/init.d/portmap ]
then
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2005-12-01 16:56:21 UTC (rev 349)
@@ -39,7 +39,7 @@
. /etc/default/tmpfs
fi
-KERNEL=`uname -s`
+KERNEL="$(uname -s)"
umask 022
# $1: file system type
@@ -126,7 +126,7 @@
do_start () {
DO_MTAB=
MOUNT_N=-n
- MTAB_PATH="`readlink -f /etc/mtab || :`"
+ MTAB_PATH="$(readlink -f /etc/mtab || :)"
case "$MTAB_PATH" in
/proc/*)
# Assume that /proc/ is not writable
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin 2005-12-01 16:56:21 UTC (rev 349)
@@ -24,7 +24,7 @@
# If /etc/nologin is a symbolic link
# then remove the destination instead of the link
#
- rm -f "`readlink -f /etc/nologin || :`"
+ rm -f "$(readlink -f /etc/nologin || :)"
;;
esac
}
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh 2005-12-01 16:56:21 UTC (rev 349)
@@ -12,8 +12,8 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
-KERNEL=`uname -s`
-RELEASE=`uname -r`
+KERNEL="$(uname -s)"
+RELEASE="$(uname -r)"
. /lib/lsb/init-functions
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/urandom
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/urandom 2005-12-01 16:44:39 UTC (rev 348)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/urandom 2005-12-01 16:56:21 UTC (rev 349)
@@ -19,7 +19,7 @@
POOLSIZE=512
if [ -f /proc/sys/kernel/random/poolsize ]
then
- POOLSIZE="`cat /proc/sys/kernel/random/poolsize`"
+ POOLSIZE="$(cat /proc/sys/kernel/random/poolsize)"
fi
SAVEDFILE=/var/lib/urandom/random-seed
More information about the Pkg-sysvinit-commits
mailing list