From 873d60c68c19ba26247c2d965749a4e57dfa0fe6 Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Sat, 20 Sep 2014 12:02:50 +0900 Subject: [PATCH] menu: modified SDB shell command To close a factory gnome-terminal after the SDB session period, suicide command should be reserved by host shell on Ubuntu. Change-Id: I090e64733834fd7a95b060fb7ebb1219ec34e950 Signed-off-by: GiWoong Kim --- .../src/org/tizen/emulator/skin/EmulatorSkin.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java index ca29027..a5fecc4 100755 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java @@ -1806,12 +1806,20 @@ public class EmulatorSkin { "-s", "emulator-" + portSdb, "shell"); } else if (SwtUtil.isMacPlatform()) { procSdb.command("./sdbscript", "emulator-" + portSdb); - /* procSdb.command( "/usr/X11/bin/uxterm", "-T", - "emulator-" + portSdb, "-e", sdbPath,"shell"); */ + /* + * procSdb.command( "/usr/X11/bin/uxterm", "-T", "emulator-" + * + portSdb, "-e", sdbPath, "shell"); + */ } else { /* Linux */ - procSdb.command("/usr/bin/gnome-terminal", - "--title=" + SkinUtil.makeEmulatorName(config), - "-x", sdbPath, "-s", "emulator-" + portSdb, "shell"); + String sdbCmd = sdbPath + " -s" + " emulator-" + portSdb + " shell"; + + /* Work Around : + * To close a factory gnome-terminal(first instance) after the SDB session + * period, suicide command should be reserved by host shell on Ubuntu. + */ + procSdb.command("/usr/bin/gnome-terminal", "--disable-factory", + "--title=" + SkinUtil.makeEmulatorName(config), "-x", + "bash", "-c", sdbCmd + "; kill -9 `ps -p $$ -o ppid=`"); } logger.info(procSdb.command().toString()); -- 2.7.4