IABSD.fr/xenocara/app/xinit/xinitrc.cpp

Branch : - branch - master - tag -

• Show log

  Commit

• Author : matthieu
  Date : 2015-10-17 08:25:11
  Hash : 33d107bf
  Message : Don't automatically launch dbus as part of the default user sessions. requested by deraadt@ no objection ajacoutot@

• app/xinit/xinitrc.cpp

• XCOMM!SHELL_CMD
  XCOMM $OpenBSD: xinitrc.cpp,v 1.13 2015/10/17 08:25:11 matthieu Exp $
  
  userresources=$HOME/.Xresources
  usermodmap=$HOME/.Xmodmap
  sysresources=XINITDIR/.Xresources
  sysmodmap=XINITDIR/.Xmodmap
  
  XCOMM merge in defaults and keymaps
  
  if [ -f $sysresources ]; then
  #ifdef __APPLE__
      if [ -x /usr/bin/cpp ] ; then
          XRDB -merge $sysresources
      else
          XRDB -nocpp -merge $sysresources
      fi
  #else
      XRDB -merge $sysresources
  #endif
  fi
  
  if [ -f $sysmodmap ]; then
      XMODMAP $sysmodmap
  fi
  
  if [ -f "$userresources" ]; then
  #ifdef __APPLE__
      if [ -x /usr/bin/cpp ] ; then
          XRDB -merge "$userresources"
      else
          XRDB -nocpp -merge "$userresources"
      fi
  #else
      XRDB -merge "$userresources"
  #endif
  fi
  
  if [ -f "$usermodmap" ]; then
      XMODMAP "$usermodmap"
  fi
  
  XCOMM if we have private ssh key(s), start ssh-agent and add the key(s)
  id1=$HOME/.ssh/identity
  id2=$HOME/.ssh/id_dsa
  id3=$HOME/.ssh/id_rsa
  id4=$HOME/.ssh/id_ecdsa
  id5=$HOME/.ssh/id_ed25519
  
  if [ -z "$SSH_AGENT_PID" ];
  then
  	if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 -o -f $id5 ];
  	then
  		eval `ssh-agent -s`
  		ssh-add < /dev/null
  	fi
  fi
  
  XCOMM start some nice programs
  
  XCLOCK -geometry 50x50-1+1 &
  XCONSOLE -iconic &
  XTERM -geometry 80x24 &
  WM || XTERM
  
  if [ "$SSH_AGENT_PID" ]; then
  	ssh-add -D < /dev/null
  	eval `ssh-agent -s -k`
  fi