mostly fixes for new error handling

[distro-setup] / desktop-20-autostart.sh

diff --git a/desktop-20-autostart.sh b/desktop-20-autostart.sh
index 66b760709b3d9071aac1be4a0ebe3469709c09de..ed83642aa02c9a9173695cd846da4e7e7155fb6e 100755 (executable)
--- a/desktop-20-autostart.sh
+++ b/desktop-20-autostart.sh
@@ -1,16 +1,30 @@
-#!/bin/bash -l
+#!/bin/bash
+# Copyright (C) 2016 Ian Kelling
 
-# first 2 alternatives showed under ubuntu 14.04, second 2 under arch at 11/2015
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-right_monitor_rotation=left
+# 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
     right_monitor_rotation=normal
 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') )
@@ -31,8 +45,10 @@ elif (( x == 2 )); then
            --output $middle --mode 2560x1600 --pos 1600x0 --rotate left
 
 fi
-/a/bin/input-setup.sh
+/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