1 files changed, 15 insertions, 1 deletions
diff --git a/terminal.vala b/terminal.vala
index c6c2525..a7cfb6b 100644
--- a/terminal.vala
+++ b/terminal.vala
@@ -71,7 +71,7 @@ class Terminal : Gtk.Overlay {
 
 			var argv = args[1:args.length];
 			if (argv.length == 0) {
-				argv = { Environment.get_variable("SHELL") };
+				argv = { get_shell() };
 			}
 
 			vte.spawn_sync(DEFAULT, null, argv, null, SEARCH_PATH, null, null, null);
@@ -145,6 +145,20 @@ class Terminal : Gtk.Overlay {
 		}
 	}
 
+	string get_shell() {
+		var env_shell = Environment.get_variable("SHELL");
+		if (env_shell != null && env_shell.length > 0){
+			return env_shell;
+		}
+
+		unowned Posix.Passwd pw = Posix.getpwuid(Posix.getuid());
+		if (pw != null && pw.pw_shell.length > 0) {
+			return pw.pw_shell;
+		}
+
+		return "/bin/sh";
+	}
+
 	bool match_modifiers(int state, Gdk.ModifierType modifiers) {
 		return (state & modifiers) == modifiers;
 	}