X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=desktop-20-autostart.sh;h=ed83642aa02c9a9173695cd846da4e7e7155fb6e;hb=7d5e9e87105fafa2243603f958c8b41cdaa7f0ad;hp=a86864a031518d3461ace01cebb9109304d19b96;hpb=c12fecb2eb85890400d451732a2acecce5b69bc4;p=distro-setup

diff --git a/desktop-20-autostart.sh b/desktop-20-autostart.sh
index a86864a..ed83642 100755
--- a/desktop-20-autostart.sh
+++ b/desktop-20-autostart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 # Copyright (C) 2016 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # first 2 alternatives showed under ubuntu 14.04, second 2 under arch at 11/2015
-
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 if [[ $1 ]]; then
     right_monitor_rotation=left
 else
@@ -24,7 +24,7 @@ fi
 
 xout="$(xrandr)"
 xe() { echo "$xout"; }
-x=$(xe | grep -E '^(DisplayPort-[0123]|DVI-0|DP-[1234]|DVI-I-1) connected' | wc -l)
+x=$(xe | grep -Ec '^(DisplayPort-[0123]|DVI-0|DP-[1234]|DVI-I-1) connected')
 if (( x > 2 )); then
     left=$(xe | sed -rn 's/^(DVI[^ ]+) connected .*/\1/p')
     dps=( $(xe | sed -rn 's/^(DP-[01234]|DisplayPort-[01234]) connected .*/\1/p') )
@@ -45,8 +45,10 @@ elif (( x == 2 )); then
            --output $middle --mode 2560x1600 --pos 1600x0 --rotate left
 
 fi
-/a/bin/distro-setup/input-setup
+/a/bin/distro-setup/input-setup m
 if isarch; then
     pulseaudio --start
 fi
+
+#indicator-kdeconnect
 date "+%A, %B %d, %r, %S seconds" > /tmp/desktop-20-autostart-log