From 953b8e7139c3c14c90635b72c393f761cd956ea8 Mon Sep 17 00:00:00 2001
From: Simon Li <orpheus+devel@gmail.com>
Date: Fri, 25 Oct 2019 23:47:10 +0100
Subject: [PATCH] Use insight 5.5.7-SNAPSHOT for websocket support

---
 README.md                                   |  6 +++---
 binder/postBuild                            | 11 ++++++++---
 jupyter_desktop/share/OMERO.insight.desktop |  6 +++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 7d9f041..b536163 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Jupyter OMERO client Desktop
+# Jupyter OMERO/Fiji/Napari Desktop
 [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/manics/jupyter-omeroanalysis-desktop/napari-binder?filepath=napari.ipynb)
 
 
@@ -6,9 +6,9 @@ Run [OMERO clients](https://www.openmicroscopy.org/omero/downloads/) and [Napari
 
 This is based on https://github.com/ryanlovett/nbnovnc
 
+Either [run on mybinder.org](https://mybinder.org/v2/gh/manics/jupyter-omeroanalysis-desktop/napari-binder?filepath=napari.ipynb) or build locally with [repo2docker](https://repo2docker.readthedocs.io/):
 ```
-docker build -t jupyter-omeroanalysis-desktop .
-docker run -it --rm -p 8888:8888 jupyter-omeroanalysis-desktop
+repo2docker .
 ```
 
 Open the displayed URL, then go to `/desktop` e.g. http://localhost:8888/desktop and if you're lucky you'll see a Linux desktop with icons for OMERO.insight and FIJI.
diff --git a/binder/postBuild b/binder/postBuild
index 6e1b130..3016635 100644
--- a/binder/postBuild
+++ b/binder/postBuild
@@ -30,25 +30,30 @@ chmod +x xstartup
 
 # Desktop applications
 # Fiji and OMERO insight
-OMERO_INSIGHT_VERSION=5.5.6
+
+#OMERO_INSIGHT_VERSION=5.5.6
+#OMERO_INSIGHT_URL_BASE=https://github.com/ome/omero-insight/releases/download/v$OMERO_INSIGHT_VERSION/
+OMERO_INSIGHT_VERSION=5.5.7-SNAPSHOT
+OMERO_INSIGHT_URL_BASE=https://users.openmicroscopy.org.uk/~spli/insight
 
 wget -q https://downloads.imagej.net/fiji/latest/fiji-nojre.zip
 unzip -q fiji-nojre.zip
 rm fiji-nojre.zip
 
 pushd Fiji.app/plugins
-wget -q https://github.com/ome/omero-insight/releases/download/v5.5.6/OMERO.imagej-$OMERO_INSIGHT_VERSION.zip
+wget -q $OMERO_INSIGHT_URL_BASE/OMERO.imagej-$OMERO_INSIGHT_VERSION.zip
 unzip -q OMERO.imagej-$OMERO_INSIGHT_VERSION.zip
 rm OMERO.imagej-$OMERO_INSIGHT_VERSION.zip
 popd
 
-wget -q https://github.com/ome/omero-insight/releases/download/v5.5.6/OMERO.insight-$OMERO_INSIGHT_VERSION.zip
+wget -q $OMERO_INSIGHT_URL_BASE/OMERO.insight-$OMERO_INSIGHT_VERSION.zip
 unzip -q OMERO.insight-$OMERO_INSIGHT_VERSION.zip
 rm OMERO.insight-$OMERO_INSIGHT_VERSION.zip
 pushd OMERO.insight-$OMERO_INSIGHT_VERSION && \
 wget -q https://www.openmicroscopy.org/img/logos/omero-logomark.svg
 popd
 
+ln -s OMERO.insight-$OMERO_INSIGHT_VERSION OMERO.insight
 mkdir Desktop
 cp $REPO_DIR/jupyter_desktop/share/*.desktop Desktop
 chmod +x Desktop/*.desktop
diff --git a/jupyter_desktop/share/OMERO.insight.desktop b/jupyter_desktop/share/OMERO.insight.desktop
index b168edd..e7d66f1 100644
--- a/jupyter_desktop/share/OMERO.insight.desktop
+++ b/jupyter_desktop/share/OMERO.insight.desktop
@@ -6,8 +6,8 @@ X-GNOME-FullName=OMERO.insight
 Comment=OMERO desktop client
 Type=Application
 Categories=Education;Science;ImageProcessing;
-Exec=/srv/conda/vnc/OMERO.insight-5.5.6/bin/omero-insight
-TryExec=/srv/conda/vnc/OMERO.insight-5.5.6/bin/omero-insight
+Exec=/srv/conda/vnc/OMERO.insight/bin/omero-insight
+TryExec=/srv/conda/vnc/OMERO.insight/bin/omero-insight
 Terminal=false
 StartupNotify=true
-Icon=/srv/conda/vnc/OMERO.insight-5.5.6/omero-logomark.svg
+Icon=/srv/conda/vnc/OMERO.insight/omero-logomark.svg