Author: branden
Date: 2003-10-27 12:36:10 -0500 (Mon, 27 Oct 2003)
New Revision: 721
Modified:
trunk/debian/changelog
trunk/debian/local/dexconf
trunk/debian/local/update-fonts-alias
trunk/debian/local/update-fonts-dir
trunk/debian/local/update-fonts-scale
trunk/debian/xserver-common.postinst.in
trunk/debian/xserver-common.postrm.in
trunk/debian/xserver-common.preinst.in
trunk/debian/xserver-xfree86.config.in
trunk/debian/xserver-xfree86.postinst.in
trunk/debian/xserver-xfree86.postrm.in
trunk/debian/xserver-xfree86.preinst.in
trunk/debian/xserver-xfree86.prerm.in
Log:
Improve efficiency of maintainer scripts and programs by using POSIX shell
parameter expansion (instead of using command substitution to run basename
on a shell variable argument).
- debian/local/dexconf
- debian/local/update-fonts-alias
- debian/local/update-fonts-dir
- debian/local/update-fonts-scale
- debian/xserver-common.postinst.in
- debian/xserver-common.postrm.in
- debian/xserver-common.preinst.in
- debian/xserver-xfree86.config.in
- debian/xserver-xfree86.postinst.in
- debian/xserver-xfree86.postrm.in
- debian/xserver-xfree86.preinst.in
- debian/xserver-xfree86.prerm.in
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/changelog 2003-10-27 17:36:10 UTC (rev 721)
@@ -262,8 +262,24 @@
fails), observe() it. (Closes: #217605)
- debian/xdm.config.in
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 27 Oct 2003 11:51:41 -0500
+ * Improve efficiency of maintainer scripts and programs by using POSIX shell
+ parameter expansion (instead of using command substitution to run basename
+ on a shell variable argument).
+ - debian/local/dexconf
+ - debian/local/update-fonts-alias
+ - debian/local/update-fonts-dir
+ - debian/local/update-fonts-scale
+ - debian/xserver-common.postinst.in
+ - debian/xserver-common.postrm.in
+ - debian/xserver-common.preinst.in
+ - debian/xserver-xfree86.config.in
+ - debian/xserver-xfree86.postinst.in
+ - debian/xserver-xfree86.postrm.in
+ - debian/xserver-xfree86.preinst.in
+ - debian/xserver-xfree86.prerm.in
+ -- Branden Robinson <[EMAIL PROTECTED]> Mon, 27 Oct 2003 12:32:03 -0500
+
xfree86 (4.2.1-12.1) unstable; urgency=low
* Fix typo in xlibs preinst. Closes: #213774, #213776
Modified: trunk/debian/local/dexconf
===================================================================
--- trunk/debian/local/dexconf 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/local/dexconf 2003-10-27 17:36:10 UTC (rev 721)
@@ -65,7 +65,7 @@
fi;
}
-PROGNAME=$(basename "$0")
+PROGNAME=${0##*/}
SHOWHELP=
EARLYEXIT=
@@ -764,7 +764,7 @@
# unconditionally
if [ "$FORMAT" = "3" ]; then
printf "### END DEBCONF SECTION\n" >> "$DEXCONFTMPDIR/dexconf-out"
- TMP="$DEXCONFTMPDIR/$(basename "$XF86CONFIG")"
+ TMP="$DEXCONFTMPDIR/${XF86CONFIG##*/}"
if [ -e "$XF86CONFIG" ]; then
# are we "clobbering" the existing config file?
db_get shared/xfree86v3/move_existing_nondebconf_config
Modified: trunk/debian/local/update-fonts-alias
===================================================================
--- trunk/debian/local/update-fonts-alias 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/local/update-fonts-alias 2003-10-27 17:36:10 UTC (rev 721)
@@ -6,7 +6,7 @@
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-PROGNAME=$(basename "$0")
+PROGNAME=${0##*/}
# display a message, wrapping lines at the terminal width
message () {
@@ -31,7 +31,7 @@
if expr "$1" : "/.*" > /dev/null 2>&1; then
# absolute path to X font directory was provided
XDIR=$1
- ETCDIR=/etc/X11/fonts/$(basename $XDIR)
+ ETCDIR=/etc/X11/fonts/${XDIR##*/}
if [ "$XDIR" = "$ETCDIR" ]; then
# they gave us an /etc directory as the argument
error "path to X font directory must be used"
Modified: trunk/debian/local/update-fonts-dir
===================================================================
--- trunk/debian/local/update-fonts-dir 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/local/update-fonts-dir 2003-10-27 17:36:10 UTC (rev 721)
@@ -6,7 +6,7 @@
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-PROGNAME=$(basename "$0")
+PROGNAME=${0##*/}
ENCDIR=/usr/X11R6/lib/X11/fonts/encodings
# display a message, wrapping lines at the terminal width
@@ -32,7 +32,7 @@
if expr "$1" : "/.*" > /dev/null 2>&1; then
# absolute path to X font directory was provided
XDIR=$1
- ETCDIR=/etc/X11/fonts/$(basename $XDIR)
+ ETCDIR=/etc/X11/fonts/${XDIR##*/}
if [ "$XDIR" = "$ETCDIR" ]; then
# they gave us an /etc directory as the argument
error "path to X font directory must be used"
Modified: trunk/debian/local/update-fonts-scale
===================================================================
--- trunk/debian/local/update-fonts-scale 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/local/update-fonts-scale 2003-10-27 17:36:10 UTC (rev 721)
@@ -6,7 +6,7 @@
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-PROGNAME=$(basename "$0")
+PROGNAME=${0##*/}
# display a message, wrapping lines at the terminal width
message () {
@@ -31,7 +31,7 @@
if expr "$1" : "/.*" > /dev/null 2>&1; then
# absolute path to X font directory was provided
XDIR=$1
- ETCDIR=/etc/X11/fonts/$(basename $XDIR)
+ ETCDIR=/etc/X11/fonts/${XDIR##*/}
if [ "$XDIR" = "$ETCDIR" ]; then
# they gave us an /etc directory as the argument
error "path to X font directory must be used"
Modified: trunk/debian/xserver-common.postinst.in
===================================================================
--- trunk/debian/xserver-common.postinst.in 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/xserver-common.postinst.in 2003-10-27 17:36:10 UTC (rev 721)
@@ -19,8 +19,8 @@
XWRAPPER_CONFIG=/etc/X11/Xwrapper.config
CONFIG_AUX_DIR=/var/lib/xfree86
-XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
-XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$(basename "$XWRAPPER_CONFIG").roster"
+XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.md5sum"
+XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.roster"
check_symlinks_and_bomb /usr/X11R6/lib/X11/xserver
Modified: trunk/debian/xserver-common.postrm.in
===================================================================
--- trunk/debian/xserver-common.postrm.in 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/xserver-common.postrm.in 2003-10-27 17:36:10 UTC (rev 721)
@@ -16,8 +16,8 @@
XWRAPPER_CONFIG=/etc/X11/Xwrapper.config
CONFIG_AUX_DIR=/var/lib/xfree86
-XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
-XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$(basename "$XWRAPPER_CONFIG").roster"
+XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.md5sum"
+XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.roster"
if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then
if [ -d /usr/X11R6/lib/X11/xserver.moved-by-preinst -a -L
/usr/X11R6/lib/X11/xserver ]; then
Modified: trunk/debian/xserver-common.preinst.in
===================================================================
--- trunk/debian/xserver-common.preinst.in 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/xserver-common.preinst.in 2003-10-27 17:36:10 UTC (rev 721)
@@ -19,7 +19,7 @@
XWRAPPER_CONFIG=/etc/X11/Xwrapper.config
CONFIG_AUX_DIR=/var/lib/xfree86
-XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XWRAPPER_CONFIG").md5sum"
+XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.md5sum"
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
# xserver dir moved to /etc/X11 in 4.x
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/xserver-xfree86.config.in 2003-10-27 17:36:10 UTC (rev 721)
@@ -465,7 +465,10 @@
db_go
elif [ $NSERVERS -eq 1 ]; then
debug_echo "autodetected X server: $SERVERS"
- if [ "$SERVERS" = "$(basename $THIS_SERVER)" ]; then
+ if [ "$SERVERS" = "${THIS_SERVER##*/}" ]; then
+ # the autodetected X server is the only one on the system, and the one
+ # we're currently configuring; it's unlikely the user will want to use
+ # something else
PRIORITY=low
else
debug_echo "X server autodetected, but does not correspond to this package"
Modified: trunk/debian/xserver-xfree86.postinst.in
===================================================================
--- trunk/debian/xserver-xfree86.postinst.in 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/xserver-xfree86.postinst.in 2003-10-27 17:36:10 UTC (rev 721)
@@ -20,10 +20,10 @@
SERVER_SYMLINK=/etc/X11/X
XF86CONFIG=/etc/X11/XF86Config-4
CONFIG_AUX_DIR=/var/lib/xfree86
-SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").md5sum"
-SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").roster"
-XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XF86CONFIG").md5sum"
-XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/$(basename "$XF86CONFIG").roster"
+SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
+SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.roster"
+XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.md5sum"
+XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.roster"
THIS_SERVER=/usr/bin/X11/XFree86
#DEBHELPER#
Modified: trunk/debian/xserver-xfree86.postrm.in
===================================================================
--- trunk/debian/xserver-xfree86.postrm.in 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/xserver-xfree86.postrm.in 2003-10-27 17:36:10 UTC (rev 721)
@@ -17,10 +17,10 @@
SERVER_SYMLINK=/etc/X11/X
XF86CONFIG=/etc/X11/XF86Config-4
CONFIG_AUX_DIR=/var/lib/xfree86
-SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").md5sum"
-SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").roster"
-XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XF86CONFIG").md5sum"
-XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/$(basename "$XF86CONFIG").roster"
+SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
+SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.roster"
+XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.md5sum"
+XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.roster"
THIS_SERVER=/usr/bin/X11/XFree86
# clean up non-conffile configuration files and related materials on purge
Modified: trunk/debian/xserver-xfree86.preinst.in
===================================================================
--- trunk/debian/xserver-xfree86.preinst.in 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-10-27 17:36:10 UTC (rev 721)
@@ -19,8 +19,8 @@
SERVER_SYMLINK=/etc/X11/X
XF86CONFIG=/etc/X11/XF86Config-4
CONFIG_AUX_DIR=/var/lib/xfree86
-SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").md5sum"
-XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$XF86CONFIG").md5sum"
+SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
+XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.md5sum"
THIS_SERVER=/usr/bin/X11/XFree86
UNCONFIGURED_LINK_TARGET=$(which true)
Modified: trunk/debian/xserver-xfree86.prerm.in
===================================================================
--- trunk/debian/xserver-xfree86.prerm.in 2003-10-27 17:15:25 UTC (rev 720)
+++ trunk/debian/xserver-xfree86.prerm.in 2003-10-27 17:36:10 UTC (rev 721)
@@ -23,7 +23,7 @@
SERVER_SYMLINK=/etc/X11/X
CONFIG_AUX_DIR=/var/lib/xfree86
-SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/$(basename "$SERVER_SYMLINK").md5sum"
+SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
UNCONFIGURED_LINK_TARGET=$(which true)
if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
