Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (fd3a5ff952da929b2e33e9a60b63b6fb35938f66)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (fd3a5ff952da929b2e33e9a60b63b6fb35938f66)
  • Date: Sun, 9 Jul 2006 13:38:03 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

utils/gpm/CONFIGURE | 27 +++++++++------------------
utils/gpm/FINAL | 4 ++--
utils/gpm/HISTORY | 4 ++++
3 files changed, 15 insertions(+), 20 deletions(-)

New commits:
commit fd3a5ff952da929b2e33e9a60b63b6fb35938f66
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gpm: make the dialogs optional #11598

diff --git a/utils/gpm/CONFIGURE b/utils/gpm/CONFIGURE
index 303fb2d..9305790 100755
--- a/utils/gpm/CONFIGURE
+++ b/utils/gpm/CONFIGURE
@@ -1,33 +1,24 @@
-get_gpm() {
-if ! grep -q "MOUSE" $SPELL_CONFIG
- then
- touch $SPELL_CONFIG
- MOUSETYPES=$(cat $SCRIPT_DIRECTORY/mousetypes)
+persistent_add MOUSE DEV &&
+# query not config_query! See locale's CONFIGURE for explanation why this is
correct
+if query "Do you want to select a mouse type and device?" n; then
+ MOUSETYPES=$(< $SCRIPT_DIRECTORY/mousetypes)
MOUSETYPES=$(dialog \
--backtitle 'GPM Configuration Menu' \
--stdout \
--title 'Select your mouse type please' \
--menu '' 0 100 10 $MOUSETYPES)
- echo "MOUSE=${MOUSETYPES//\"/}" >> $SPELL_CONFIG
-fi
-}
-get_mousedev() {
-if ! grep -q "DEV" $SPELL_CONFIG
- then
- touch $SPELL_CONFIG
- MOUSEDEV=$(cat $SCRIPT_DIRECTORY/mousedev)
+ MOUSE="${MOUSETYPES//\"/}"
+
+ MOUSEDEV=$(< $SCRIPT_DIRECTORY/mousedev)
MOUSEDEV=$(dialog \
--backtitle 'GPM Configuration Menu' \
--stdout \
--title 'Select your mouse device entry please' \
--menu '' 0 100 10 $MOUSEDEV)
if [[ "$MOUSEDEV" == "custom" ]]; then
+ persistent_remove DEV
config_query_string DEV "Input mouse device:"
else
- echo "DEV=${MOUSEDEV//\"/}" >> $SPELL_CONFIG
+ DEV="${MOUSEDEV//\"/}"
fi
fi
-}
-
-get_gpm
-get_mousedev
diff --git a/utils/gpm/FINAL b/utils/gpm/FINAL
index 9a516a1..f5c0d4f 100755
--- a/utils/gpm/FINAL
+++ b/utils/gpm/FINAL
@@ -1,6 +1,6 @@
CONF=${INSTALL_ROOT}/etc/sysconfig/gpm
if [ -e $CONF ]; then
- grep -q MOUSE=MTYPE $CONF && sedit "s:MTYPE:$MOUSE:" $CONF
- grep -q DEV=MDEV $CONF && sedit "s:MDEV:$DEV:" $CONF
+ grep -q MOUSE=MTYPE $CONF && sed -i "s:MTYPE:${MOUSE:-pnp}:" $CONF
+ grep -q DEV=MDEV $CONF && sed -i "s:MDEV:${DEV:-/dev/mouse}:" $CONF
fi
true
diff --git a/utils/gpm/HISTORY b/utils/gpm/HISTORY
index 3e454e6..c46b5bd 100644
--- a/utils/gpm/HISTORY
+++ b/utils/gpm/HISTORY
@@ -1,3 +1,7 @@
+2006-07-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: make the dialogs optional #11598 and clean it up
+ * FINAL: insert default values if none were specified
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide




  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (fd3a5ff952da929b2e33e9a60b63b6fb35938f66), Jaka Kranjc, 07/09/2006

Archive powered by MHonArc 2.6.24.

Top of Page