- updated to 1.2.8

[packages/imsettings.git] / imsettings-no-bash.patch

--- imsettings-1.2.8/data/xinput.sh.in.in.orig	2012-02-17 21:15:19.743090124 +0100
+++ imsettings-1.2.8/data/xinput.sh.in.in	2012-02-18 07:28:16.724321553 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Copyright (C) 1999-2004,2007-2011 Red Hat, Inc. All rights reserved. This
 # copyrighted material is made available to anyone wishing to use, modify,
 # copy, or redistribute it subject to the terms and conditions of the
@@ -10,27 +10,27 @@
 #
 # X Input method setup script
 
-function log_init() {
+log_init() {
     if [ ! -n "$DRY_RUN" ]; then
 	rm -rf $HOME/.imsettings.log
 	touch $HOME/.imsettings.log
     fi
 }
 
-function log() {
+log() {
     echo "$@" >> $HOME/.imsettings.log
 }
 
-function is_dbus_enabled() {
+is_dbus_enabled() {
     imsettings-check --check-dbus
     [ $? -eq 0 ]
 }
 
-function is_imsettings_enabled() {
+is_imsettings_enabled() {
     [ -z "$DISABLE_IMSETTINGS" ] && is_dbus_enabled
 }
 
-function check_imsettings_capability() {
+check_imsettings_capability() {
     mod=$1
     imsettings-check --check-modules >/dev/null
     ret=$?
@@ -41,7 +41,7 @@
     return $ret
 }
 
-function lookup_desktop() {
+lookup_desktop() {
     ret=$(cat $1)
     case $ret in
 	gnome*)
@@ -62,7 +62,7 @@
     esac
 }
 
-function get_desktop() {
+get_desktop() {
     if [ -n "$GDMSESSION" ]; then
 	GUESS_DESKTOP="\$GDMSESSION"
 	echo "$GDMSESSION"
@@ -89,7 +89,7 @@
     fi
 }
 
-function is_gtk_supported() {
+is_gtk_supported() {
     [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
     case "$(get_desktop|tr '[A-Z]' '[a-z]')" in
 	*gnome|openbox)
@@ -114,7 +114,7 @@
     return 1
 }
 
-function is_qt_supported() {
+is_qt_supported() {
     [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
     case "$(get_desktop|tr '[A-Z]' '[a-z]')" in
 	*)
@@ -127,7 +127,7 @@
     return 1
 }
 
-function is_xim_supported() {
+is_xim_supported() {
     [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
     if check_imsettings_capability xim; then
 	return 0
@@ -136,7 +136,7 @@
     return 1
 }
 
-function setup_gtk_immodule() {
+setup_gtk_immodule() {
     if is_imsettings_enabled && is_gtk_supported; then
 	# Ensure GTK_IM_MODULE is empty. otherwise GTK+ doesn't pick up immodule through XSETTINGS
 	unset GTK_IM_MODULE
@@ -146,7 +146,7 @@
     fi
 }
 
-function setup_qt_immodule() {
+setup_qt_immodule() {
     if is_imsettings_enabled && is_qt_supported; then
 	# FIXME: Qt doesn't support XSETTINGS for immodule yet.
 	#        We still need to go with the older way.
@@ -156,7 +156,7 @@
     fi
 }
 
-function setup_xim() {
+setup_xim() {
     if is_imsettings_enabled && is_xim_supported; then
 	# setup XMODIFIERS
 	XMODIFIERS="@im=imsettings"
@@ -167,7 +167,7 @@
     fi
 }
 
-function run_imsettings() {
+run_imsettings() {
     print_info
     if [ -n "$DRY_RUN" ]; then
 	log "*** DRY RUN MODE: running IM through imsettings"
@@ -182,7 +182,7 @@
     fi
 }
 
-function run_xim() {
+run_xim() {
     print_info
     if [ -n "$DRY_RUN" ]; then
 	log "*** DRY RUN MODE: running IM without imsettings"
@@ -195,7 +195,7 @@
     fi
 }
 
-function print_result() {
+print_result() {
     $1
     if [ $? -eq 0 ]; then
 	log yes
@@ -204,7 +204,7 @@
     fi
 }
 
-function print_info() {
+print_info() {
     log "imsettings information"
     log "=========================="
     log "XINPUTRC: $READ_XINPUTRC"
@@ -242,13 +242,13 @@
 unset TERM
 if [ -r /etc/profile.d/lang.sh ]; then
     # for Fedora etc
-    source /etc/profile.d/lang.sh
+    . /etc/profile.d/lang.sh
 elif [ -r /etc/default/locale ]; then
     # for Debian
-    source /etc/default/locale
+    . /etc/default/locale
 elif [ -r /etc/env.d/02locale ]; then
     # for Gentoo
-    source /etc/env.d/02locale
+    . /etc/env.d/02locale
 fi
 [ -n "$oldterm" ] && export TERM=$oldterm
 
@@ -260,7 +260,7 @@
 [ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
 
 if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then
-    source "$USER_XINPUTRC"
+    . "$USER_XINPUTRC"
     READ_XINPUTRC=$USER_XINPUTRC
     if [ ! -h "$USER_XINPUTRC" ]; then
 	SHORT_DESC="User Specific"
@@ -272,7 +272,7 @@
     _sourced_xinputrc=0
     for i in $_im_language_list; do
         if echo $tmplang | grep -q -E "^$i"; then
-            source "$SYS_XINPUTRC"
+            . "$SYS_XINPUTRC"
             READ_XINPUTRC=$SYS_XINPUTRC
             _sourced_xinputrc=1
             break
@@ -284,7 +284,7 @@
         _xcompose_language_list="am_ET el_GR fi_FI pt_BR ru_RU"
         for i in $_xcompose_language_list; do
             if echo $tmplang | grep -q -E "^$i"; then
-                source @XINPUT_PATH@/xcompose.conf
+                . @XINPUT_PATH@/xcompose.conf
                 _sourced_xinputrc=1
                 break
             fi
@@ -292,7 +292,7 @@
     fi
     if [ $_sourced_xinputrc -eq 0 ]; then
         # Read none.conf to set up properly for locales not listed the above.
-        source @XINPUT_PATH@/none.conf
+        . @XINPUT_PATH@/none.conf
     fi
 fi
 
--- imsettings-1.2.4/data/xinputinfo.sh.in.orig	2011-03-08 07:39:32.000000000 +0100
+++ imsettings-1.2.4/data/xinputinfo.sh.in	2011-07-17 22:57:52.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # xinputinfo.sh
 # Copyright (C) 2008 Red Hat, Inc. All rights reserved.
 #
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-function is_script() {
+is_script() {
     if [ "x$(sed -re '/^[ 	]?*[a-zA-Z0-9_]+=.*/{d};/[ 	]?*#.*/{d}' $1)" = "x" ]; then
 	return 1
     else
@@ -36,13 +36,13 @@
 unset TERM
 if [ -r /etc/profile.d/lang.sh ]; then
     # for Fedora etc
-    source /etc/profile.d/lang.sh
+    . /etc/profile.d/lang.sh
 elif [ -r /etc/default/locale ]; then
     # for Debian
-    source /etc/default/locale
+    . /etc/default/locale
 elif [ -r /etc/env.d/02locale ]; then
     # for Gentoo
-    source /etc/env.d/02locale
+    . /etc/env.d/02locale
 fi
 [ -n "$oldterm" ] && export TERM=$oldterm
 
@@ -52,16 +52,16 @@
 unset AUXILIARY_PROGRAM AUXILIARY_ARGS GTK_IM_MODULE ICON IMSETTINGS_IGNORE_ME LONG_DESC PREFERENCE_PROGRAM PREFERENCE_ARGS QT_IM_MODULE SHORT_DESC XIM XIM_PROGRAM XIM_ARGS IS_XIM
 
 if [ $# -gt 0 ]; then
-    source $1
+    . $1
     IMSETTINGS_FILENAME=$1
 else
     [ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
 
     if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then
-	source "$USER_XINPUTRC"
+	. "$USER_XINPUTRC"
 	IMSETTINGS_FILENAME=$USER_XINPUTRC
     elif [ -r "$SYS_XINPUTRC" ]; then
-	source "$SYS_XINPUTRC"
+	. "$SYS_XINPUTRC"
 	IMSETTINGS_FILENAME=$SYS_XINPUTRC
     fi
 fi