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

bin/watch_for_webclient_file_changes

@@ -1,3 +0,0 @@
-#!/bin/bash
-pushd /opt/iocom/user/webclient/
-ffind -v "appcache|all_desktop|visiwebrtc.js" | peat 'webclient_files_have_changed'

bin/webclient_files_have_changed

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# replace timestamp in manifest
-p4 edit visimeet.appcache
-sed -i "2 s/.*/#$(date +%s)/" visimeet.appcache
-
-# compile jsx into js
-jsx js/jsx js
-
-# remake concatenated js and css files
-xargs cat < js/all_desktop.inc > /opt/iocom/user/webclient/all_desktop.js
-xargs cat < css/all_desktop.inc > /opt/iocom/user/webclient/css/all_desktop.css
-
-xargs cat < js/webrtc_api.inc > /opt/iocom/user/webclient/visiwebrtc.js
-uglifyjs /opt/iocom/user/webclient/visiwebrtc.js -o /opt/iocom/user/webclient/visiwebrtc.js

zshrc

@@ -24,6 +24,9 @@ if [ -x "$(command -v nvim)" ]; then
     alias vi=nvim
     alias vim=nvim
     export EDITOR=nvim
+else
+    alias vi=vim
+    export EDITOR=vim
 fi
 
 # typing 'emacs' should not load any config