Merge lp:~knny-myer/clicompanion/fix-636119 into lp:clicompanion

[Kenny Meyer]

Fixes starting clicompanion with the wrong shell

[lp:~knny-myer/clicompanion/fix-636119]

49. By Kenny Meyer on 2010-09-18

added utils.py

[Duane Hinnen (duanedesign)]

review: Approve

=== modified file 'clicompanion.py'
--- clicompanion.py	2010-09-13 11:53:55 +0000
+++ clicompanion.py	2010-09-18 11:59:39 +0000
@@ -30,6 +30,8 @@
 import locale
 import gettext
 
+from utils import get_user_shell
+
 BASEDIR = os.curdir
 
 def get_language():
@@ -429,7 +431,7 @@
         _vte = vte.Terminal()
         _vte.set_size_request(700, 220)
         _vte.connect ("child-exited", lambda term: gtk.main_quit())
-        _vte.fork_command('bash')
+        _vte.fork_command(get_user_shell()) # Get the user's default shell
 
         vte_tab = gtk.ScrolledWindow()
         vte_tab.add(_vte)

=== added file 'utils.py'
--- utils.py	1970-01-01 00:00:00 +0000
+++ utils.py	2010-09-18 11:59:39 +0000
@@ -0,0 +1,50 @@
+# -*- mode: python; coding: utf-8; -*-
+#
+# clicompanion.py - commandline tool.
+#
+# Copyright 2010 Duane Hinnen, Kenny Meyer, Marcos Vanetta
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+"""
+A collection of useful functions.
+"""
+
+import getpass
+
+
+def get_user_shell():
+    """Get the user's shell defined in /etc/passwd ."""
+    data = None
+    try:
+        # Read out the data in /etc/passwd
+        with open('/etc/passwd') as f:
+            data = f.readlines()
+    except e:
+        print "Something unexpected happened!"
+        raise e
+
+    for i in data:
+        tmp = i.split(":")
+        # Check for the entry of the currently logged in user
+        if tmp[0] == getpass.getuser(): 
+            # Columns are separated by colons, so split each column.
+            # Sample /etc/passwd entry for a user:
+            # 
+            #  jorge:x:1001:1002:,,,:/home/jorge:/bin/bash
+            #
+            # The last column is relevant for us.
+            # Don't forget to strip the newline at the end of the string!
+            return i.split(":")[-1:][0].strip('\n')