X Strike Force SVN commit: rev 513 - trunk/debian
Author: branden
Date: 2003-09-12 11:10:27 -0500 (Fri, 12 Sep 2003)
New Revision: 513
Modified:
trunk/debian/xbase-clients.preinst.in
trunk/debian/xdm.init
trunk/debian/xdm.preinst.in
trunk/debian/xdm.prerm.in
trunk/debian/xserver-common.preinst.in
trunk/debian/xserver-xfree86.preinst.in
trunk/debian/xterm.preinst.in
Log:
debian/{xdm.init,xdm.prerm.in,xterm.preinst.in,xserver-xfree86.preinst.in,
xbase-clients.preinst.in,xserver-common.preinst.in,xdm.preinst.in}:
(cosmetic) it's not necessary to escape the newline after a multiline
shell command when the token immediately before the newline is a
logical or pipe operator (not true of redirection operators, though)
Modified: trunk/debian/xbase-clients.preinst.in
===================================================================
--- trunk/debian/xbase-clients.preinst.in 2003-09-12 14:07:44 UTC (rev 512)
+++ trunk/debian/xbase-clients.preinst.in 2003-09-12 16:10:27 UTC (rev 513)
@@ -43,7 +43,7 @@
# xconsole stopped being an alternative when Xaw wrappers died
if dpkg --compare-versions "$2" lt "3.3.4-1"; then
- if ! update-alternatives --display xconsole | \
+ if ! update-alternatives --display xconsole |
fgrep -q /usr/X11R6/bin/xconsole.real; then
update-alternatives --remove xconsole /usr/X11R6/bin/xconsole.real
fi
Modified: trunk/debian/xdm.init
===================================================================
--- trunk/debian/xdm.init 2003-09-12 14:07:44 UTC (rev 512)
+++ trunk/debian/xdm.init 2003-09-12 16:10:27 UTC (rev 513)
@@ -39,8 +39,8 @@
case "$1" in
start)
- if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && \
- [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
+ if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
+ [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
[ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
echo "Not starting X display manager (xdm); it is not the default display manager."
else
Modified: trunk/debian/xdm.preinst.in
===================================================================
--- trunk/debian/xdm.preinst.in 2003-09-12 14:07:44 UTC (rev 512)
+++ trunk/debian/xdm.preinst.in 2003-09-12 16:10:27 UTC (rev 513)
@@ -36,7 +36,7 @@
# got rid of the shared libXdmGreet in 4.0.3
if dpkg --compare-versions "$2" lt "4.0.3-1"; then
- if update-alternatives --display xdm-greeter | \
+ if update-alternatives --display xdm-greeter |
fgrep -q /usr/X11R6/lib/libXdmGreet.so.1; then
debugmsg "removing obsolete xdm-greeter alternative and .so symlink"
update-alternatives --remove xdm-greeter /usr/X11R6/lib/libXdmGreet.so.1
Modified: trunk/debian/xdm.prerm.in
===================================================================
--- trunk/debian/xdm.prerm.in 2003-09-12 14:07:44 UTC (rev 512)
+++ trunk/debian/xdm.prerm.in 2003-09-12 16:10:27 UTC (rev 513)
@@ -34,7 +34,7 @@
STOP=
# are we supposed to restart on upgrade? if REMOVING xdm, we don't care what
# the user says, we have to stop the daemon
-if grep -qs ^restart-on-upgrade /etc/X11/xdm/xdm.options || \
+if grep -qs ^restart-on-upgrade /etc/X11/xdm/xdm.options ||
[ -n "$REMOVING" ]; then
# is there an xdm process running?
if start-stop-daemon --stop --quiet --signal 0 --exec /usr/bin/X11/xdm; then
Modified: trunk/debian/xserver-common.preinst.in
===================================================================
--- trunk/debian/xserver-common.preinst.in 2003-09-12 14:07:44 UTC (rev 512)
+++ trunk/debian/xserver-common.preinst.in 2003-09-12 16:10:27 UTC (rev 513)
@@ -70,7 +70,7 @@
if [ -e "$XWRAPPER_CONFIG" ]; then
# make sure the "debconf markers" are there, too; if they've been
# removed, the user didn't want the file molested
- if egrep -q '^### BEGIN DEBCONF SECTION' "$XWRAPPER_CONFIG" && \
+ if egrep -q '^### BEGIN DEBCONF SECTION' "$XWRAPPER_CONFIG" &&
egrep -q '^### END DEBCONF SECTION' "$XWRAPPER_CONFIG"; then
# finally, people were letting debconf "manage" the config file
# even though they complained when it did so and did not follow
Modified: trunk/debian/xserver-xfree86.preinst.in
===================================================================
--- trunk/debian/xserver-xfree86.preinst.in 2003-09-12 14:07:44 UTC (rev 512)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-09-12 16:10:27 UTC (rev 513)
@@ -97,7 +97,7 @@
if [ -e "$XF86CONFIG" ]; then
# make sure the "debconf markers" are there, too; if they've
# been removed, the user didn't want the file molested
- if egrep -q '^### BEGIN DEBCONF SECTION' "$XF86CONFIG" && \
+ if egrep -q '^### BEGIN DEBCONF SECTION' "$XF86CONFIG" &&
egrep -q '^### END DEBCONF SECTION' "$XF86CONFIG"; then
# finally, people were letting debconf "manage" the config
# file even though they complained when it did so and did not
Modified: trunk/debian/xterm.preinst.in
===================================================================
--- trunk/debian/xterm.preinst.in 2003-09-12 14:07:44 UTC (rev 512)
+++ trunk/debian/xterm.preinst.in 2003-09-12 16:10:27 UTC (rev 513)
@@ -17,7 +17,7 @@
if [ "$1" = "upgrade" -o "$1" = "install" ]; then
if dpkg --compare-versions "$2" lt "4.0.1-1"; then
# clean up after older alternative that used different path
- if update-alternatives --display x-terminal-emulator | \
+ if update-alternatives --display x-terminal-emulator |
fgrep -q /usr/bin/X11/xterm; then
update-alternatives --remove x-terminal-emulator /usr/bin/X11/xterm
fi
Reply to: