From 205716797577fb6b0333266bb457cf1fde381d90 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Wed, 16 Nov 2016 12:31:06 -0600 Subject: [PATCH 1/2] Fixing zsh for systems that don't have nvum --- zshrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zshrc b/zshrc index ff90b0c..72ffb87 100644 --- a/zshrc +++ b/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 # Mac only From 9a8eae281d1ee12f417127a6b3a3d358958fc362 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Thu, 15 Dec 2016 09:46:12 -0600 Subject: [PATCH 2/2] Removing these, now I'm using build scripts in the directory --- bin/watch_for_webclient_file_changes | 3 --- bin/webclient_files_have_changed | 15 --------------- 2 files changed, 18 deletions(-) delete mode 100755 bin/watch_for_webclient_file_changes delete mode 100755 bin/webclient_files_have_changed diff --git a/bin/watch_for_webclient_file_changes b/bin/watch_for_webclient_file_changes deleted file mode 100755 index 1c745c1..0000000 --- a/bin/watch_for_webclient_file_changes +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -pushd /opt/iocom/user/webclient/ -ffind -v "appcache|all_desktop|visiwebrtc.js" | peat 'webclient_files_have_changed' diff --git a/bin/webclient_files_have_changed b/bin/webclient_files_have_changed deleted file mode 100755 index 651a3c6..0000000 --- a/bin/webclient_files_have_changed +++ /dev/null @@ -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