From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 20 Nov 2015 14:24:09 +0000 (+0000)
Subject: Fixed some issues with dali_env script
X-Git-Tag: dali_1.1.12~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdec01a2a87eb33b4f4515a9bd7c42fd6b22415e;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Fixed some issues with dali_env script

- It can now be run in directories that begin with "dali-env..." (before it just used to get stuck in a loop).
- Display the newly installed dali_env path on output rather than just "dali_env" alone as that may reference an already installed one.

Change-Id: I0364cc2fd4731c1d7727df2ca1c19ee615b1d3e0
---

diff --git a/build/scripts/dali_env b/build/scripts/dali_env
index f69909f..3230e9e 100755
--- a/build/scripts/dali_env
+++ b/build/scripts/dali_env
@@ -96,14 +96,14 @@ my $root_path = getcwd();
 if($exec_path =~ m!dali-env/opt/bin!)
 {
     $root_path = $exec_path;
-    while($root_path !~ m!dali-env$!)
+    while($root_path !~ m!dali-env$! && $root_path != "")
     {
         $root_path = dirname($root_path);
     }
 }
 elsif($root_path =~ m!dali-env!)
 {
-    while($root_path !~ m!dali-env$!)
+    while($root_path =~ m!dali-env$! && $root_path != "")
     {
         $root_path = dirname($root_path);
     }
@@ -163,7 +163,7 @@ sub create_setenv
     print <<"EOF";
 # To use the desktop libraries, please add the following lines to your .bashrc or
 # create a setenv script from them, e.g. by running this command as follows
-# \$ dali_env -s > setenv
+# \$ $install_path/bin/dali_env -s > setenv
 #
 # You can then source this script by using
 # \$ . setenv