From 58750b5499efb9729a76a7a856fdae6c757c7255 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Tue, 29 Oct 2019 14:13:14 -0700
Subject: [PATCH] Move xstartup file into package

Removes need for that step in postBuild
---
 jupyter_desktop.py => jupyter_desktop/__init__.py |  4 +++-
 {share => jupyter_desktop/share}/xstartup         |  0
 postBuild                                         |  3 ---
 setup.py                                          | 13 ++++++-------
 4 files changed, 9 insertions(+), 11 deletions(-)
 rename jupyter_desktop.py => jupyter_desktop/__init__.py (86%)
 rename {share => jupyter_desktop/share}/xstartup (100%)
 mode change 100644 => 100755

diff --git a/jupyter_desktop.py b/jupyter_desktop/__init__.py
similarity index 86%
rename from jupyter_desktop.py
rename to jupyter_desktop/__init__.py
index e63165b..029e09b 100644
--- a/jupyter_desktop.py
+++ b/jupyter_desktop/__init__.py
@@ -1,6 +1,8 @@
 import os
 
 
+HERE = os.path.dirname(os.path.abspath(__file__))
+
 def setup_desktop():
     VNC_APPLICATION_DIR = os.path.join(os.getenv('CONDA_DIR'), 'vnc')
     return {
@@ -13,7 +15,7 @@ def setup_desktop():
             '--',
             VNC_APPLICATION_DIR + '/bin/vncserver',
             '-verbose',
-            '-xstartup', VNC_APPLICATION_DIR + '/xstartup',
+            '-xstartup', os.path.join(HERE, 'share/xstartup'),
             '-geometry', '1024x768',
             '-SecurityTypes', 'None',
             '-rfbunixpath', VNC_APPLICATION_DIR + '/socket',
diff --git a/share/xstartup b/jupyter_desktop/share/xstartup
old mode 100644
new mode 100755
similarity index 100%
rename from share/xstartup
rename to jupyter_desktop/share/xstartup
diff --git a/postBuild b/postBuild
index d99725a..77ce1ba 100644
--- a/postBuild
+++ b/postBuild
@@ -25,7 +25,4 @@ sed -i.bak \
     noVNC-1.1.0/vnc_lite.html
 
 
-cp $REPO_DIR/share/xstartup .
-chmod +x xstartup
-
 pip install $REPO_DIR
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 696fe21..599270e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,17 +1,16 @@
-import setuptools
+from setuptools import setup, find_packages
 
 
-setuptools.setup(
+setup(
     name="jupyter-desktop-server",
-    # py_modules rather than packages, since we only have 1 file
-    py_modules=['jupyter_desktop'],
+    packages=find_packages(),
+    version='0.1',
     entry_points={
         'jupyter_serverproxy_servers': [
             'desktop = jupyter_desktop:setup_desktop',
         ]
     },
     install_requires=['jupyter-server-proxy'],
-    package_data={
-        'jupyter_desktop': ['desktop/*'],
-    },
+    include_package_data=True,
+    zip_safe=False
 )