Bump 3.2.4

CHANGELOG.md

@@ -1,3 +1,9 @@
+[3.2.4](https://github.com/paradoxxxzero/butterfly/compare/3.2.3...3.2.4)
+=====
+
+* Fix up --uri-root-path so behaves as one would expect for this. Fix #155 (PR #173 thanks @GrahamDumpleton)
+* Fix websocket keepalive. Fix #167 (PR #172 thanks @fzumstein)
+
 [3.2.3](https://github.com/paradoxxxzero/butterfly/compare/3.2.2...3.2.3)
 =====
 

Makefile

@@ -5,7 +5,7 @@ all: install lint check-outdated run-debug
 
 install:
 	test -d $(VENV) || virtualenv $(VENV) -p $(PYTHON_VERSION)
-	$(PIP) install --upgrade --no-cache pip setuptools -e .[lint] devcore
+	$(PIP) install --upgrade --no-cache pip setuptools -e .[lint,themes] devcore
 	$(NPM) install
 
 clean:

butterfly/__about__.py

@@ -1,5 +1,5 @@
 __title__ = "butterfly"
-__version__ = "3.2.3"
+__version__ = "3.2.4"
 
 __summary__ = "A sleek web based terminal emulator"
 __uri__ = "https://github.com/paradoxxxzero/butterfly"

butterfly/static/main.css

@@ -70,37 +70,37 @@
 /* along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 @font-face {
   font-family: "SourceCodePro";
-  src: url("fonts/SourceCodePro-ExtraLight.otf") format("woff");
+  src: url("/static/fonts/SourceCodePro-ExtraLight.otf") format("woff");
   font-weight: 100; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("fonts/SourceCodePro-Light.otf") format("woff");
+  src: url("/static/fonts/SourceCodePro-Light.otf") format("woff");
   font-weight: 300; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("fonts/SourceCodePro-Regular.otf") format("woff");
+  src: url("/static/fonts/SourceCodePro-Regular.otf") format("woff");
   font-weight: 400; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("fonts/SourceCodePro-Medium.otf") format("woff");
+  src: url("/static/fonts/SourceCodePro-Medium.otf") format("woff");
   font-weight: 500; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("fonts/SourceCodePro-Semibold.otf") format("woff");
+  src: url("/static/fonts/SourceCodePro-Semibold.otf") format("woff");
   font-weight: 600; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("fonts/SourceCodePro-Bold.otf") format("woff");
+  src: url("/static/fonts/SourceCodePro-Bold.otf") format("woff");
   font-weight: 700; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("fonts/SourceCodePro-Black.otf") format("woff");
+  src: url("/static/fonts/SourceCodePro-Black.otf") format("woff");
   font-weight: 900; }
 
 body {

butterfly/static/main.js

@@ -23,12 +23,12 @@
     } else {
       wsUrl = 'ws://';
     }
-    rootPath = document.body.getAttribute('data-root-path').replace(/^\/+|\/+$/g, '');
+    rootPath = document.body.getAttribute('data-root-path');
     if (rootPath.length) {
       rootPath = "/" + rootPath;
     }
     wsUrl += document.location.host + rootPath;
-    path = '/';
+    path = location.pathname;
     if (path.indexOf('/session') < 0) {
       path += "session/" + (document.body.getAttribute('data-session-token'));
     }