]> git.donarmstrong.com Git - deb_pkgs/autorandr.git/commitdiff
Merge remote-tracking branch 'public/patch-2'
authorOndřej Vodáček <ondrej.vodacek@gmail.com>
Sun, 15 Dec 2013 17:40:52 +0000 (18:40 +0100)
committerOndřej Vodáček <ondrej.vodacek@gmail.com>
Sun, 15 Dec 2013 17:40:52 +0000 (18:40 +0100)
* public/patch-2:
  bash_completion: load profiles only when .autorandr directory exists

Conflicts:
bash_completion/autorandr

1  2 
bash_completion/autorandr

index ff6a03576e49f52e327be11a893f6ada8cf48b0e,1dd716ab18e66fd800d373f89df24f5ca83c3643..b17b41ca4215a2c2c50e9b526340147fe8181acd
@@@ -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
                --*)