Author: branden
Date: 2003-08-19 22:30:44 -0500 (Tue, 19 Aug 2003)
New Revision: 412
Modified:
trunk/debian/xserver-common.postinst.in
trunk/debian/xserver-xfree86.postinst.in
Log:
debian/xserver-{common,xfree86}.postinst.in: minor logic simplification;
don't create a variable that is only dereferenced once
Modified: trunk/debian/xserver-common.postinst.in
===================================================================
--- trunk/debian/xserver-common.postinst.in 2003-08-20 03:27:04 UTC (rev 411)
+++ trunk/debian/xserver-common.postinst.in 2003-08-20 03:30:44 UTC (rev 412)
@@ -45,8 +45,7 @@
if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ]; then
# next, compare the current and stored checksums; if they do not match,
# assume that's the way the user wants it
- CURRENT_MD5SUM=$(md5sum "$XWRAPPER_CONFIG")
- if [ "$CURRENT_MD5SUM" = "$(cat "$XWRAPPER_CONFIG_CHECKSUM")" ]; then
+ if [ "$(md5sum "$XWRAPPER_CONFIG")" = "$(cat "$XWRAPPER_CONFIG_CHECKSUM")" ]; then
# they match; prepare a new version of the config file
db_get xserver-common/xwrapper/actual_allowed_users
ALLOWED_USERS="$RET"
Modified: trunk/debian/xserver-xfree86.postinst.in
===================================================================
--- trunk/debian/xserver-xfree86.postinst.in 2003-08-20 03:27:04 UTC (rev 411)
+++ trunk/debian/xserver-xfree86.postinst.in 2003-08-20 03:30:44 UTC (rev 412)
@@ -44,8 +44,7 @@
if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
# compare the current and stored checksums; if they do not match, assume
# that's the way the user wants it
- CURRENT_MD5SUM=$(readlink "$SERVER_SYMLINK" | md5sum)
- if [ "$CURRENT_MD5SUM" = "$(cat "$SERVER_SYMLINK_CHECKSUM")" ]; then
+ if [ "$(readlink "$SERVER_SYMLINK" | md5sum)" = "$(cat
"$SERVER_SYMLINK_CHECKSUM")" ]; then
# finally, only update the symlink if this package contains the selected
# default X server
db_get shared/default-x-server
@@ -95,8 +94,7 @@
if [ -e "$XF86CONFIG_CHECKSUM" ]; then
# compare the current and stored checksums; if they do not match, assume
# that's the way the user wants it
- CURRENT_MD5SUM=$(md5sum "$XF86CONFIG")
- if [ "$CURRENT_MD5SUM" = "$(cat "$XF86CONFIG_CHECKSUM")" ]; then
+ if [ "$(md5sum "$XF86CONFIG")" = "$(cat "$XF86CONFIG_CHECKSUM")" ]; then
# they match; prepare a new version of the config file
NEW_XF86CONFIG=$(tempfile)
if dexconf -o "$NEW_XF86CONFIG"; then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
