From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Thu, 3 Dec 2015 05:14:17 +0000 (+0900)
Subject: sdb: change sdb path
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b7d52dfeed933653a32f1dba65f4ff8a09a47a8;p=sdk%2Femulator%2Fqemu.git

sdb: change sdb path

because of restructuring directories, relative path of sdb changed.

Change-Id: I6b6a5ebe7eb29a4f2f393a2587e799b7b8905abc
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

diff --git a/tizen/src/scripts/sdbscript b/tizen/src/scripts/sdbscript
index f4984d657a..c6629fb958 100755
--- a/tizen/src/scripts/sdbscript
+++ b/tizen/src/scripts/sdbscript
@@ -1,15 +1,15 @@
 #!/bin/sh
-if [ "$1" == "" ];
+if [ "$#" -ne 2 ];
 then
-        echo "There is no emulator name for an argument. \nusage: sdbscript emulator-261xx"
-        exit -1
-else
-    TITLE=$1
-    osascript > /dev/null << END
-    tell application "Terminal"
-        activate
-        do script "\"`pwd`/../../sdb\" -s $TITLE shell"
-        set custom title of first window to "$TITLE"
-    end tell
-END
+        echo "usage: sdbscript \${SDB_PATH} emulator-261xx"
+        exit 1
 fi
+
+TITLE=$2
+osascript > /dev/null << END
+tell application "Terminal"
+activate
+do script "\"$1\" -s $TITLE shell"
+set custom title of first window to "$TITLE"
+end tell
+END
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 034f86762e..cdd6849da2 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
@@ -1827,7 +1827,7 @@ public class EmulatorSkin {
 					procSdb.command("cmd.exe", "/c", "start", sdbPath, "sdb",
 							"-s", "emulator-" + portSdb, "shell");
 				} else if (SwtUtil.isMacPlatform()) {
-					procSdb.command("./sdbscript", "emulator-" + portSdb);
+					procSdb.command("./sdbscript", sdbPath, "emulator-" + portSdb);
 					/*
 					 * procSdb.command( "/usr/X11/bin/uxterm", "-T", "emulator-"
 					 * + portSdb, "-e", sdbPath, "shell");