X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=desktop-20-autostart.sh;h=ed83642aa02c9a9173695cd846da4e7e7155fb6e;hb=165008e5b82c81ebff1061c8f8294c3bc6e9dced;hp=842dab48bc37a4450f7a7c94a7ce0fef289ecce5;hpb=f0a35267f28e274ef3c2f63ffc20a26ca864e37c;p=distro-setup diff --git a/desktop-20-autostart.sh b/desktop-20-autostart.sh index 842dab4..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') )