From e287c9981f3f06b8b367ee329bf8faa59b1d8ccc Mon Sep 17 00:00:00 2001
From: Munkyu Im <munkyu.im@samsung.com>
Date: Thu, 7 May 2015 16:34:09 +0900
Subject: [PATCH] sdb: change sdb path

because of restructuring directories, relative path of sdb changed.

Change-Id: Ib5150ccd9909e02e5c300e5e9a72cb5292820c05
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
---
 tizen/src/scripts/sdbscript                   | 24 +++++++++----------
 .../org/tizen/emulator/skin/EmulatorSkin.java |  2 +-
 .../tizen/emulator/skin/util/SkinUtil.java    | 12 ++++++----
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/tizen/src/scripts/sdbscript b/tizen/src/scripts/sdbscript
index 1f5b0b470a..9f8116fc19 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 cb245dfa6b..25201d7e72 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -1877,7 +1877,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");
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
index 99f2e120bd..472ab2891b 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
@@ -170,15 +170,17 @@ public class SkinUtil {
 	}
 
 	public static String getSdbPath() {
-		String sdbPath = null;
-
+		StringBuilder sdbPath = new StringBuilder(".." + File.separator + ".."
+				+ File.separator + ".." + File.separator + ".."
+				+ File.separator + ".." + File.separator + "tools"
+				+ File.separator);
 		if (SwtUtil.isWindowsPlatform()) {
-			sdbPath = "..\\..\\ansicon.exe";
+			sdbPath.append("ansicon.exe");
 		} else {
-			sdbPath = "../../sdb";
+			sdbPath.append("sdb");
 		}
 
-		return (binaryPath + sdbPath);
+		return (binaryPath + sdbPath.toString());
 	}
 
 	public static String getEcpPath() {
-- 
2.34.1