Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 543200 | Differences between
and this patch

Collapse All | Expand All

(-)linuxconsoletools-1.4.8.orig/utils/jscal-restore.in (-3 / +8 lines)
Lines 6-13 Link Here
6
    exit 1
6
    exit 1
7
fi
7
fi
8
8
9
if [ ! -x /sbin/udevadm ]; then
9
for f in /sbin/udevadm /bin/udevadm ;
10
    echo Restoring joystick configuration requires udev! >&2
10
do
11
    [ -x $f ] && UDEVADM=$f
12
done
13
14
if [ -z "$UDEVADM" ] ; then
15
    echo Storing joystick configuration requires udev! >&2
11
    exit 1
16
    exit 1
12
fi
17
fi
13
18
Lines 30-36 Link Here
30
# in the NAME value
35
# in the NAME value
31
IFS=$'\x0A'
36
IFS=$'\x0A'
32
37
33
for ATTRIBUTE in $( /sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
38
for ATTRIBUTE in $( ${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
34
    ID=$( echo "$ATTRIBUTE" | cut -f 1 -d = )
39
    ID=$( echo "$ATTRIBUTE" | cut -f 1 -d = )
35
    VALUE=$( echo "$ATTRIBUTE" | cut -f 2 -d \" )
40
    VALUE=$( echo "$ATTRIBUTE" | cut -f 2 -d \" )
36
    case $ID in
41
    case $ID in
(-)linuxconsoletools-1.4.8.orig/utils/jscal-store.in (-2 / +6 lines)
Lines 11-24 Link Here
11
    echo "Stores the device's calibration for future use."
11
    echo "Stores the device's calibration for future use."
12
    exit 1
12
    exit 1
13
fi
13
fi
14
for f in /sbin/udevadm /bin/udevadm ;
15
do
16
    [ -x $f ] && UDEVADM=$f
17
done
14
18
15
if [ ! -x /sbin/udevadm ]; then
19
if [ -z "$UDEVADM" ] ; then
16
    echo Storing joystick configuration requires udev! >&2
20
    echo Storing joystick configuration requires udev! >&2
17
    exit 1
21
    exit 1
18
fi
22
fi
19
23
20
ident=$(mktemp)
24
ident=$(mktemp)
21
/sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident
25
${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident
22
. $ident
26
. $ident
23
rm $ident
27
rm $ident
24
28

Return to bug 543200