Remove all parts that aren't just XFCE

- Move everything to base directory, since this repo is only for jupyter-desktop - Remove packages not needed for base functionality from apt.txt and environment.yml - Remove extra desktop shortcuts
mawigh · Oct 29, 2019 · fdcd053 · fdcd053
1 parent 953b8e7
commit fdcd053
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 210 deletions.
diff --git a/binder/apt.txt → apt.txt b/binder/apt.txt → apt.txt
@@ -1,14 +1,8 @@
-curl
 dbus-x11
 firefox
-less
-net-tools
-openjdk-8-jre
-unzip
-vim
 xfce4
 xfce4-panel
 xfce4-session
 xfce4-settings
 xorg
-xubuntu-icon-theme 
+xubuntu-icon-theme
diff --git a/binder/environment.yml b/binder/environment.yml
diff --git a/binder/postBuild b/binder/postBuild
diff --git a/environment.yml b/environment.yml
@@ -0,0 +1,6 @@
+channels:
+  - manics
+dependencies:
+  - websockify
+  - pip:
+    - https://github.com/jupyterhub/jupyter-server-proxy/archive/0e67e1afd0bab1342443f13bd147a2f8c682e9e0.zip
diff --git a/jupyter_desktop/jupyter_desktop.py → jupyter_desktop.py b/jupyter_desktop/jupyter_desktop.py → jupyter_desktop.py
diff --git a/jupyter_desktop/share/Fiji.desktop b/jupyter_desktop/share/Fiji.desktop
diff --git a/jupyter_desktop/share/OMERO.insight.desktop b/jupyter_desktop/share/OMERO.insight.desktop
diff --git a/napari.ipynb b/napari.ipynb
diff --git a/postBuild b/postBuild
@@ -0,0 +1,31 @@
+#!/bin/bash
+set -eux
+
+env
+
+VNC_APPLICATION_DIR=$CONDA_DIR/vnc
+mkdir $VNC_APPLICATION_DIR
+pushd $VNC_APPLICATION_DIR
+
+# Novnc: just want web files
+curl -sSfL https://github.com/novnc/noVNC/archive/v1.1.0.tar.gz | tar -zxf -
+
+
+# Install tigervnc
+curl -sSfL 'https://bintray.com/tigervnc/stable/download_file?file_path=tigervnc-1.9.0.x86_64.tar.gz' | tar -zxf - --strip=2
+
+# Patch novnc to use correct path to websockify (defaults to /)
+# Note if you use vnc.html you will need to patch ui.js to use the correct path
+# and also to override localstorage which may store an incorrect path from a
+# different session
+# Also resize server instead of scaling client
+sed -i.bak \
+    -e "s%\('path', 'websockify'\)%'path', window.location.pathname.replace(/[^/]*$/, '').substring(1) + 'websockify'); console.log('websockify path:' + path%" \
+    -re "s%rfb.scaleViewport = .+%rfb.resizeSession = readQueryVariable('resize', true);%" \
+    noVNC-1.1.0/vnc_lite.html
+
+
+cp $REPO_DIR/share/xstartup .
+chmod +x xstartup
+
+pip install $REPO_DIR
diff --git a/jupyter_desktop/setup.py → setup.py b/jupyter_desktop/setup.py → setup.py
diff --git a/jupyter_desktop/share/xstartup → share/xstartup b/jupyter_desktop/share/xstartup → share/xstartup
diff --git a/binder/start → start b/binder/start → start