Merge branch 'master' of github.com:IvanMalison/dotfiles

dotfiles/emacs.d/README.org

@@ -3161,7 +3161,6 @@ background of code to whatever theme I'm using's background"
     (add-hook 'markdown-mode-hook 'imalison:disable-linum-mode)))
 #+END_SRC
 *** plantuml-mode
-This mode seems to be better maintained than plantuml-mode
 #+BEGIN_SRC emacs-lisp
 (use-package plantuml-mode
   :commands plantuml-mode

dotfiles/lib/shellenv/functions.sh

@@ -445,6 +445,10 @@ function in_git_directory {
     [ -d .git ]
 }
 
+function process_running {
+    [[ ! -z "$(pgrep $@)" ]]
+}
+
 function which_readlink {
     readlink -f "$(which $1)"
 }

dotfiles/lib/shellenv/synergy.sh

@@ -1,7 +1,7 @@
 SYNERGY_CONF="$HOME/.synergy.conf"
 
 synergy_start_client_at() {
-    ssh "$1" 'test -z $(pgrep synergyc) || synergyc '"$(localip)"'; ps aux | grep synergyc'
+    ssh "$1" '[[ -z "$(pgrep synergyc)" ]] && synergyc '"$(localip)"
 }
 
 synergy_start_server_here() {