From c4c1264a44d9c796247008e55a73e7ea023f09b9 Mon Sep 17 00:00:00 2001
From: Alexander Tiunov <tiunovas@mail.ru>
Date: Sun, 13 Mar 2016 20:58:49 +0300
Subject: [PATCH] Added everware-server to scripts

---
 everware/authenticator.py      |  5 -----
 everware/user_spawn_handler.py |  2 +-
 everware/user_wait_handler.py  |  2 +-
 scripts/everware-server        | 14 ++++++++++++++
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100755 scripts/everware-server

diff --git a/everware/authenticator.py b/everware/authenticator.py
index a4daff8..399de4b 100644
--- a/everware/authenticator.py
+++ b/everware/authenticator.py
@@ -66,8 +66,6 @@ class WelcomeHandler(BaseHandler):
     """Render the login page."""
 
     def _render(self, login_error=None, username=None):
-        if username:
-            username = username.lower()
         return self.render_template('login.html',
                 next=url_escape(self.get_argument('next', default='')),
                 repourl=url_escape(self.get_argument('repourl', default='')),
@@ -146,7 +144,6 @@ def get(self):
 
         username, token = yield self.authenticator.authenticate(self)
         if username:
-            username = username.lower()
             user = self.user_from_username(username)
             user.token = token
             self.set_login_cookie(user)
@@ -309,8 +306,6 @@ def authenticate(self, handler):
         whitelisted = yield self.check_whitelist(username, headers)
         if not whitelisted:
             username = None
-        if username:
-            username = username.lower()
         return username
 
     def check_whitelist(self, username, headers):
diff --git a/everware/user_spawn_handler.py b/everware/user_spawn_handler.py
index 69009e3..60fd23d 100644
--- a/everware/user_spawn_handler.py
+++ b/everware/user_spawn_handler.py
@@ -16,7 +16,7 @@ def _spawn(self, user, form_options):
     def get(self):
         user = self.get_current_user()
         if user.running:
-            name = user.name.lower()
+            name = user.name
             self.log.debug("User is running: %s", name)
             self.redirect('/user/%s' % name)
             return
diff --git a/everware/user_wait_handler.py b/everware/user_wait_handler.py
index eddc541..c0c3f0e 100644
--- a/everware/user_wait_handler.py
+++ b/everware/user_wait_handler.py
@@ -11,7 +11,7 @@ class UserSpawnHandler(BaseHandler):
     @gen.coroutine
     def get(self, name, user_path):
         current_user = self.get_current_user()
-        if current_user and current_user.name == name.lower():
+        if current_user and current_user.name == name:
             # logged in, work with spawner
             if current_user.stop_pending:
                 self.redirect(url_path_join(self.hub.server.base_url, 'home'))
diff --git a/scripts/everware-server b/scripts/everware-server
new file mode 100755
index 0000000..8ad5e46
--- /dev/null
+++ b/scripts/everware-server
@@ -0,0 +1,14 @@
+#!/bin/bash
+source ./env.sh
+PYTHON_MAJOR=`python -c 'import sys; print(sys.version_info[0])'`
+if [ ${PYTHON_MAJOR} -eq 3 ] ; then
+    PYTHON=python
+    PIP=pip
+elif [ -n `which python3` ] ; then
+    PYTHON=python3
+    PIP=pip3
+else
+    echo "Unable to find python"
+    exit 1
+fi
+${PYTHON} ./run.py "$@"