Attachment 48033 Details for Bug 113646

[patch] patch against your version

delme (text/plain), 1.79 KB, created by Forgotten User ZhJd0F0L3x on 2005-08-29 15:49:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User ZhJd0F0L3x

Created: 2005-08-29 15:49:47 UTC

Size: 1.79 KB

patch

obsolete

>--- acpi_hotkeys_ASUS_M6842NW	2005-08-29 14:26:49.000000000 +0200
>+++ /home/seife/projects/powermanagement/cvs/powersave-head/contrib/acpi_hotkeys_ASUS_M6842NW	2005-08-29 17:43:37.000000000 +0200
>@@ -7,22 +7,15 @@
> PATH=/bin:/usr/bin # be paranoid, we're running as root.
> # first get helper functions (e.g. DEBUG, load_scheme, ...), extend $PATH,
> # set variables etc. We get $SCRIPT_RETURN from here
>-. "/usr/lib/powersave/scripts/helper_functions"
>+. ${0%/*}/helper_functions # `dirname $0`/helper_functions
> # get_x_user comes from here...
>-. "/usr/lib/powersave/scripts/x_helper_functions"
>-export PATH
>-
>-MYNAME=${0##*/} # basename $0
>-#
>-# look into the example_event_script for an explanation. We need this for
>-# $SCRIPT_RETURN
>-NUM=$4
>+. ${SCRIPT_DIR}/x_helper_functions
> 
> # previously, we checked for $# <= 3. This is not very future-proof ;-)
>-if [ -z "$NUM" ]; then
>+if [ -z "$EV_ID" ]; then
>     logger -t $MYNAME 'Sorry, not enough arguments: $4 is empty.'
>-    $SCRIPT_RETURN "$NUM|1|$MYNAME finished unsuccessful."
>-    exit 1
>+    $SCRIPT_RETURN $EV_ID 1 "$MYNAME finished unsuccessful."
>+    EXIT 1
> fi
> 
> run_on_xserver() {
>@@ -31,7 +24,7 @@
> }
> 
> TYPE=$1
>-set $3 # powersaved gives us "other '<content of /proc/acpi/event>'" so we must split it.
>+set $3 # powersaved gives us "other 'schemename' '<content of /proc/acpi/event>'" so we must split it.
> EVENT=$1   # "hotkey"
> ACPI=$2    # "HOTK"
> WHAT=$3    # "00000052"
>@@ -172,11 +165,11 @@
>   fi
>   : # turn touchpad on or off
> else
>-  DEBUG "undefined hotkey: $VAL $TYPE $EVENT $ACPI $WHAT $SERIAL" DIAG
>+  DEBUG "undefined hotkey: keycode '$VAL'. $TYPE $EVENT $ACPI $WHAT $SERIAL" DIAG
>   ret=1
> fi
> #
> # see example_event_script for an explanation.
>-$SCRIPT_RETURN "$NUM|0|$MYNAME finished"
>+$SCRIPT_RETURN $EV_ID 0 "$MYNAME finished"
> #
>-exit $ret
>+EXIT $ret

Actions: View | Diff

Attachments on bug 113646: 48033 | 49677