Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/src/modules/basic-input/input.client.class.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2397 by niro, Tue Jul 15 08:31:30 2014 UTC revision 2398 by niro, Fri Aug 28 09:39:30 2015 UTC
# Line 44  set_input_keyboard() Line 44  set_input_keyboard()
44  get_input_keymap()  get_input_keymap()
45  {  {
46   local keymap   local keymap
47   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]] && pidof X &> /dev/null   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]] && [[ -n $(pidof X) ]] || [[ -n $(pidof Xorg) ]]
48   then   then
49   keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')   keymap=$(x11runas "setxkbmap -query" | grep layout | awk '{print $2}')
50   else   else

Legend:
Removed from v.2397  
changed lines
  Added in v.2398