From: Ondřej Vodáček <ondrej.vodacek@gmail.com>
Date: Sun, 15 Dec 2013 17:40:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'public/patch-2'
X-Git-Tag: 1.0~145^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7dc195c48149312928caf5dcbd61dd68c4b70104;p=deb_pkgs%2Fautorandr.git

Merge remote-tracking branch 'public/patch-2'

* public/patch-2:
  bash_completion: load profiles only when .autorandr directory exists

Conflicts:
	bash_completion/autorandr
---

7dc195c48149312928caf5dcbd61dd68c4b70104
diff --cc bash_completion/autorandr
index ff6a035,1dd716a..b17b41c
--- a/bash_completion/autorandr
+++ b/bash_completion/autorandr
@@@ -9,8 -9,11 +9,11 @@@ _autorandr (
  	prev="${COMP_WORDS[COMP_CWORD-1]}"
  
  	opts="-h -c -s -l -d"
 -	lopts="--help --change --save --load --default --force --fingerprint"
 +	lopts="--help --change --save --load --default --force --fingerprint --config"
- 	prfls="`find ~/.autorandr/* -maxdepth 1 -type d -printf '%f\n'`"
+ 	prfls=""
+ 	if [ -d ~/.autorandr/ ]; then
+ 		prfls="`find ~/.autorandr/* -maxdepth 1 -type d -printf '%f\n'`"
+ 	fi
  
  	case "${cur}" in
  		--*)