X Strike Force XFree86 SVN commit: rev 705 - trunk/debian
Author: branden
Date: 2003-10-23 02:25:18 -0500 (Thu, 23 Oct 2003)
New Revision: 705
Modified:
trunk/debian/xserver-xfree86.config.in
Log:
Convert more PRIORITY_CEILING parameter expansions to use the
priority_ceil() shell function. (continuation of revision 701)
- debian/xserver-xfree86.config.in
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2003-10-23 07:02:09 UTC (rev 704)
+++ trunk/debian/xserver-xfree86.config.in 2003-10-23 07:25:18 UTC (rev 705)
@@ -485,8 +485,8 @@
# now the default-x-server question may be asked
db_fget shared/default-x-server seen
debug_echo "seen flag of shared/default-x-server is $RET"
-debug_echo "db_input ${PRIORITY_CEILING:-$PRIORITY} shared/default-x-server"
-auto_answer db_input ${PRIORITY_CEILING:-$PRIORITY} shared/default-x-server "$DEFAULT"
+debug_echo "db_input $(priority_ceil $PRIORITY) shared/default-x-server"
+auto_answer db_input $(priority_ceil $PRIORITY) shared/default-x-server "$DEFAULT"
# is this the selected X server?
db_get shared/default-x-server
@@ -579,7 +579,7 @@
fi
db_subst xserver-xfree86/config/device/driver choices "$DRIVER_LIST"
-auto_answer db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/device/driver "$DEFAULT"
+auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/device/driver "$DEFAULT"
# card identifier; try to set a sensible default
DEFAULT=
@@ -635,9 +635,9 @@
fi
# this question requires input validation
if [ -n "$DEFAULT" ]; then
- auto_answer validate_bus_id_db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/device/bus_id "$DEFAULT"
+ auto_answer validate_bus_id_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/device/bus_id "$DEFAULT"
else
- validate_bus_id_db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/device/bus_id || debug_report_status "validate_bus_id_db_input ${PRIORITY_CEILING:-$PRIORITY} xserver-xfree86/config/device/bus_id" "$?"
+ validate_bus_id_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/device/bus_id || debug_report_status "validate_bus_id_db_input $(priority_ceil $PRIORITY) xserver-xfree86/config/device/bus_id" "$?"
fi
# video RAM
@@ -691,7 +691,7 @@
else
DEFAULT=xfree86
fi
-MAY_BE_NULL= auto_answer validate_string_db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/inputdevice/keyboard/rules "$DEFAULT"
+MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/keyboard/rules "$DEFAULT"
db_get xserver-xfree86/config/inputdevice/keyboard/rules
if [ "$RET" = "sun" ]; then
@@ -709,9 +709,9 @@
DEFAULT=pc104
fi
fi
-MAY_BE_NULL= auto_answer validate_string_db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/inputdevice/keyboard/model "$DEFAULT"
+MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/keyboard/model "$DEFAULT"
-MAY_BE_NULL= auto_answer validate_string_db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/inputdevice/keyboard/layout "us"
+MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/keyboard/layout "us"
db_get xserver-xfree86/config/inputdevice/keyboard/layout
if [ "$RET" != "us" ]; then
@@ -719,9 +719,9 @@
else
PRIORITY=low
fi
-MAY_BE_NULL=yes validate_string_db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/inputdevice/keyboard/variant
+MAY_BE_NULL=yes validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/keyboard/variant
-MAY_BE_NULL=yes validate_string_db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/inputdevice/keyboard/options
+MAY_BE_NULL=yes validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/keyboard/options
# mouse device detection
@@ -750,7 +750,7 @@
while :; do
# bail out if autodetection tool not available
which mdetect > /dev/null 2>&1 || break
- auto_answer db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/autodetect_mouse "false"
+ auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/autodetect_mouse "false"
db_get xserver-xfree86/autodetect_mouse
if [ "$RET" = "true" ]; then
set +e
@@ -795,7 +795,7 @@
fi
db_subst xserver-xfree86/config/inputdevice/mouse/port choices $MOUSE_PORT_CHOICES
-auto_answer db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/inputdevice/mouse/port "${AUTODETECTED_PORT:-$DEFAULT_PORT}"
+auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/mouse/port "${AUTODETECTED_PORT:-$DEFAULT_PORT}"
db_get xserver-xfree86/config/inputdevice/mouse/port
case "$RET" in
@@ -825,7 +825,7 @@
debug_echo "\$MOUSE_PROTOCOL_CHOICES has only one value; setting xserver-xfree86/config/inputdevice/mouse/protocol to \"$DEFAULT_PROTOCOL\""
db_set xserver-xfree86/config/inputdevice/mouse/protocol "$DEFAULT_PROTOCOL"
else
- auto_answer db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/inputdevice/mouse/protocol "${AUTODETECTED_PROTOCOL:-$DEFAULT_PROTOCOL}"
+ auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/inputdevice/mouse/protocol "${AUTODETECTED_PROTOCOL:-$DEFAULT_PROTOCOL}"
fi
db_input "$(priority_ceil low)" xserver-xfree86/config/inputdevice/mouse/emulate3buttons || debug_report_status "db_input $(priority_ceil low) xserver-xfree86/config/inputdevice/mouse/emulate3buttons" "$?"
@@ -868,7 +868,7 @@
# if configuring for the first time, ask if user wants to autodetect
if [ -z "$RECONFIGURE" ]; then
if which get-edid > /dev/null 2>&1; then
- auto_answer db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/autodetect_monitor "false"
+ auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/autodetect_monitor "false"
db_get xserver-xfree86/autodetect_monitor
if [ "$RET" = "true" ]; then
set +e
@@ -937,7 +937,7 @@
esac
fi
# this question requires input validation
-MAY_BE_NULL= auto_answer validate_string_db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/monitor/identifier "$DEFAULT"
+MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/identifier "$DEFAULT"
# priority of xserver-xfree86/config/monitor/{several things}
PRIORITY=high
@@ -951,7 +951,7 @@
debug_echo "monitor hsync and vrefresh question priority is $PRIORITY"
-auto_answer db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/monitor/lcd "false"
+auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/lcd "false"
db_get xserver-xfree86/config/monitor/lcd
debug_echo "xserver-xfree86/config/monitor/lcd is $RET"
MONITOR_IS_LCD="$RET"
@@ -963,12 +963,12 @@
db_subst xserver-xfree86/config/monitor/selection-method default "Simple"
fi
-auto_answer db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/monitor/selection-method "Advanced"
+auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/selection-method "Advanced"
db_get xserver-xfree86/config/monitor/selection-method
case "$RET" in
Simple)
- db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/monitor/screen-size || debug_report_status "db_input ${PRIORITY_CEILING:-$PRIORITY} xserver-xfree86/config/monitor/screen-size" "$?"
+ db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/screen-size || debug_report_status "db_input $(priority_ceil $PRIORITY) xserver-xfree86/config/monitor/screen-size" "$?"
db_go
db_get xserver-xfree86/config/monitor/screen-size
case "$RET" in
@@ -995,7 +995,7 @@
esac
;;
Medium)
- db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/monitor/mode-list || debug_report_status "db_input ${PRIORITY_CEILING:-$PRIORITY} xserver-xfree86/config/monitor/mode-list" "$?"
+ db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/mode-list || debug_report_status "db_input $(priority_ceil $PRIORITY) xserver-xfree86/config/monitor/mode-list" "$?"
db_go
db_get xserver-xfree86/config/monitor/mode-list
case "$RET" in
@@ -1070,8 +1070,8 @@
esac
;;
Advanced)
- auto_answer validate_monitor_frequency_db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/monitor/horiz-sync "28-50"
- auto_answer validate_monitor_frequency_db_input "${PRIORITY_CEILING:-$PRIORITY}" xserver-xfree86/config/monitor/vert-refresh "43-75"
+ auto_answer validate_monitor_frequency_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/horiz-sync "28-50"
+ auto_answer validate_monitor_frequency_db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/config/monitor/vert-refresh "43-75"
;;
esac
Reply to: