Merge branch 'master' of github.com:liftoff/GateOne

ThinkLib · Nov 12, 2015 · b14de79 · b14de79
2 parents 79484b2 + ea31e7b
commit b14de79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gateone/applications/terminal/app_terminal.py b/gateone/applications/terminal/app_terminal.py
@@ -149,7 +149,7 @@ def get(self, share_id):
         if os.path.exists(minified_js_abspath):
             gateone_js = "%sstatic/gateone.min.js" % self.settings['url_prefix']
         index_path = resource_filename(
-            'gateone.applications.terminal', '/templates/index.html')
+            'gateone.applications.terminal', '/templates/share.html')
         self.render(
             index_path,
             share_id=share_id,

diff --git a/gateone/applications/terminal/plugins/ssh/scripts/ssh_connect.py b/gateone/applications/terminal/plugins/ssh/scripts/ssh_connect.py
@@ -471,7 +471,7 @@ def openssh_connect(
     args = ['-c', script_path, '&&', 'rm', '-f', script_path]
     # if we detect /bin/sh linked to busybox then make sure we insert the 'sh'
     # at the beginning of the args list
-    if os.path.realpath('/bin/sh').endswith('busybox'):
+    if os.path.islink('/bin/sh'):
         args.insert(0, 'sh')
     os.execvpe('/bin/sh', args, env)
     os._exit(0)