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

diff --git a/desktop-20-autostart.sh b/desktop-20-autostart.sh
index ed83642..69f455f 100755
--- a/desktop-20-autostart.sh
+++ b/desktop-20-autostart.sh
@@ -14,40 +14,42 @@
 # 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
+  right_monitor_rotation=left
 else
-    right_monitor_rotation=normal
+  right_monitor_rotation=normal
 fi
 
 
-xout="$(xrandr)"
+if ! xout="$(xrandr)"; then
+  # under wayland
+  exit 0
+fi
 xe() { echo "$xout"; }
 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') )
+  left=$(xe | sed -rn 's/^(DVI[^ ]+) connected .*/\1/p')
+  dps=( $(xe | sed -rn 's/^(DP-[01234]|DisplayPort-[01234]) connected .*/\1/p') )
 
-    middle=${dps[1]}
-    right=${dps[0]}
-    # on older distros, i needed to swap middle and right.
+  middle=${dps[1]}
+  right=${dps[0]}
+  # on older distros, i needed to swap middle and right.
 
 
-    xrandr --output $left --mode 2560x1600 --pos 0x0 --rotate left \
-           --output $middle --mode 2560x1600 --pos 1600x0 --rotate left \
-           --output $right --mode 2560x1600 --pos 3200x0 --rotate $right_monitor_rotation
+  xrandr --output $left --mode 2560x1600 --pos 0x0 --rotate left \
+         --output $middle --mode 2560x1600 --pos 1600x0 --rotate left \
+         --output $right --mode 2560x1600 --pos 3200x0 --rotate $right_monitor_rotation
 elif (( x == 2 )); then
-    # 3rd monitor not working atm, so doing this.
-    left=$(xe | sed -rn 's/^(DVI[^ ]+) connected .*/\1/p')
-    middle=$(xe | sed -rn 's/^(DP-[01234]|DisplayPort-[01234]) connected .*/\1/p')
-    xrandr --output $left --mode 2560x1600 --pos 0x0 --rotate left \
-           --output $middle --mode 2560x1600 --pos 1600x0 --rotate left
+  # 3rd monitor not working atm, so doing this.
+  left=$(xe | sed -rn 's/^(DVI[^ ]+) connected .*/\1/p')
+  middle=$(xe | sed -rn 's/^(DP-[01234]|DisplayPort-[01234]) connected .*/\1/p')
+  xrandr --output $left --mode 2560x1600 --pos 0x0 --rotate left \
+         --output $middle --mode 2560x1600 --pos 1600x0 --rotate left
 
 fi
 /a/bin/distro-setup/input-setup m
 if isarch; then
-    pulseaudio --start
+  pulseaudio --start
 fi
 
 #indicator-kdeconnect