From 32e49ea38c280794f9f00f7999ae41609252f8c4 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 17 Mar 2005 14:41:40 +0000 Subject: - need the X driver to call monitor-probe-using-X so ask it everytime - fix typo --- monitor-probe | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/monitor-probe b/monitor-probe index 1bd1533..74af0be 100755 --- a/monitor-probe +++ b/monitor-probe @@ -5,11 +5,19 @@ if [ "$1" = -v ]; then shift fi -if [ -n "$1" ]; then - echo "usage: monitor-probe [-v]" +if [ "$1" = -h -o "$1" = --help ]; then + opt_h="$1" + shift +fi + +if [ $# != 1 ]; then + echo "usage: monitor-probe [-v] " + echo "(X driver is one of: i810, nv, radeon...)" exit 1 fi +X_driver="$1" + if [ $EUID != 0 ]; then echo "you must be root to run this program" exit 1 @@ -19,7 +27,7 @@ fi monitor-edid $opt_v && exit 0 [ -n "$opt_v" ] && echo "probing using X" -monitor-probe-using-X && echo 0 +monitor-probe-using-X $X_driver && exit 0 [ -n "$opt_v" ] && echo "probing DMI" lspcidrake | sed -n 's/^\(Resolution\|Diagonal_size\):\([^:]*\):.*/\1: \2/p' -- cgit v1.2.1