Merge branch 'master' of https://github.com/davezerave/dot

* 'master' of https://github.com/davezerave/dot:
  Added /opt/vc/bin and /opt/vc/sbin to PATH for raspberry pi
  Fixed vim unaliasing for beaglebone and raspberry pi
  Updated start_jack/stop_jack for my beaglebone
  Fixed xvfb-run commands for my beaglebone

5 files changed, 29 insertions, 4 deletions

diff --git a/.zsh.after/aliases.zsh b/.zsh.after/aliases.zsh
index ab67230..55c85ad 100644
--- a/.zsh.after/aliases.zsh
+++ b/.zsh.after/aliases.zsh
@@ -163,7 +163,9 @@ alias grep='grep --color=auto --exclude-dir=.git'
 alias exit="clear; exit"
 alias du='du -h'
 alias .='source'
-unalias vim
+if [[ "$HOST" != *pitheunlord* && "$HOST" != *beagleclone* ]];then
+  unalias vim
+fi
 unalias brew
 #  unalias scp
 
diff --git a/.zsh.before/path.zsh b/.zsh.before/path.zsh
index 5519374..f463e69 100644
--- a/.zsh.before/path.zsh
+++ b/.zsh.before/path.zsh
@@ -1,4 +1,5 @@
 # < BEFORE $PATH
+PATH=$HOME/bin:$PATH
 # > BEFORE
 
 # < AFTER $PATH
@@ -12,5 +13,10 @@
 
 ## RVM
 PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
-PATH=$HOME/bin:$PATH
+
+## RASPBERRY PI
+if [[ "$HOST" == *pitheunlord* ]]; then
+  PATH=$PATH:"/opt/vc/bin:/opt/vc/sbin"
+fi
+
 # > AFTER
diff --git a/bin/sclang b/bin/sclang
index 9cbd92d..a34f4ea 100755
--- a/bin/sclang
+++ b/bin/sclang
@@ -6,5 +6,5 @@ if [[ $HOSTNAME == *dvzrv* ]]; then
   /usr/bin/sclang "$@"
 else
   echo "/usr/bin/sclang in fake X screen"
-  /usr/bin/xvfb-run --server-args="-screen 1, 1280x800x24" /usr/bin/sclang "$@"
+  /usr/bin/xvfb-run -s "-screen 1, 1280x800x24" -a -e ~/.log/xvfb-run-sclang.error /usr/bin/sclang "$@"
 fi
diff --git a/bin/start_jack b/bin/start_jack
index 351d7e3..d28733c 100755
--- a/bin/start_jack
+++ b/bin/start_jack
@@ -9,7 +9,15 @@ case "$HOSTNAME" in
     alsa_out -d hw:0 -q1 &> .log/alsa_out.log &
     ;;
   "beagleclone")
-    /usr/bin/xvfb-run --server-args="-screen 0, 1280x800x24" jackd -dalsa -dhw:1,0 -p128 -n3 -s &> .log/jackd.log &
+    CARDS=$(aplay -l)
+    EXTERNAL="card 1"
+    if [[ "$CARDS" == *$EXTERNAL* ]];then
+      echo "Starting with external USB card"
+      /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:1,0 -p128 -n3 -s &> ~/.log/jackd.log &
+    else
+      echo "Starting with internal HDMI card"
+      /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:0,0 -p128 -n3 -s &> ~/.log/jackd.log &
+    fi
     ;;
   "dvzrv")
     DEVICE="/dev/fw1"
diff --git a/bin/stop_jack b/bin/stop_jack
new file mode 100755
index 0000000..ab49fa9
--- /dev/null
+++ b/bin/stop_jack
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+kill $(pidof jackd)
+#case "$HOSTNAME" in
+#  "beagleclone")
+#    kill $(pidof jackd)
+#    kill $(pidof xvfb-run)
+#  ;;
+#esac