From c2da3eaa699b1d53a9dbd08bcf0ca59848724fa4 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Mon, 20 May 2013 12:18:25 +0200
Subject: [PATCH] Various fixes with 'em' path.

---
 .config/dwb/settings   | 2 +-
 .config/ranger/rc.conf | 4 ++--
 .scripts/homeinit      | 2 +-
 .shell.d/alias_rc      | 4 ++--
 .shell.d/main_rc       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.config/dwb/settings b/.config/dwb/settings
index b5e81c80..a2b3bb66 100644
--- a/.config/dwb/settings
+++ b/.config/dwb/settings
@@ -153,7 +153,7 @@ max-visible-completions=11
 hint-offset-top=0
 javascript-api=automatic
 mouse-cycles-through-tabs=true
-tab-orientation=vertical-left
+tab-orientation=horizontal
 maximum-tabs=0
 cookie-expiration=0
 tab-width=150
diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf
index e6ff9794..0b842a69 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -128,8 +128,8 @@ map ep shell -w mogrify -resize 50% %s
 map ev console shell mplayer "%f" -sub "%s"
 map eV console shell mplayer "%f" -sub "%s" -subcp latin1
 
-## Submarine
-map es shell -w submarine %f
+## Subs
+map es shell -w subdl %f
 
 ## Audio
 map ea shell cmus-remote -P %s
diff --git a/.scripts/homeinit b/.scripts/homeinit
index 0f2e64cc..d94a00bb 100755
--- a/.scripts/homeinit
+++ b/.scripts/homeinit
@@ -16,7 +16,7 @@ mkdir -p temp
 if [ ! -f /bin/em ]; then
     echo "==> Emacs (press Ctrl-D to skip)"
     sudo sh -c "echo '#!/bin/sh
-emacsclient -a \"\" -t \"\$@\"' > '/bin/em'; chmod 755 /bin/em"
+emacsclient -a \"\" -t \"\$@\"' > '/bin/em'; chmod 755 /usr/local/bin/em"
     echo
 fi
 
diff --git a/.shell.d/alias_rc b/.shell.d/alias_rc
index cac952cc..afd6944a 100644
--- a/.shell.d/alias_rc
+++ b/.shell.d/alias_rc
@@ -109,10 +109,10 @@ alias xres='xrandr -s $(xrandr | awk '"'"'/^ / {print $1;exit}'"'"')'
 ## Emacs
 ##==============================================================================
 # See .homeinit
-if [ -f /bin/em ]; then
+if [ -n "$(command -v em)" ]; then
    alias ema='emacs -q -l ~/.emacs-light'
    alias emacs-reload="emacsclient -e '(kill-emacs)' >/dev/null 2>&1; emacs --daemon"
-   [ -f ~/todo.org ] && alias todo='em ~/todo.org'
+   [ -f "$HOME/todo.org" ] && alias todo='em ~/todo.org'
 fi
 
 ##==============================================================================
diff --git a/.shell.d/main_rc b/.shell.d/main_rc
index 445c0793..b2f1b2dc 100644
--- a/.shell.d/main_rc
+++ b/.shell.d/main_rc
@@ -89,7 +89,7 @@ if [ -n "$(command -v emacs)" ]; then
    EDITOR='emacs'
 fi
 ## 'em' is a script for emacsclient. See 'homeinit'.
-if [ -f "/bin/em" ]; then
+if [ -n "$(command -v em)" ]; then
    EDITOR='em'
 fi
 export EDITOR