You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2015/12/08 17:56:46 UTC
[11/20] incubator-trafodion git commit: Copied pull request 187 to
release1.3 branch
Copied pull request 187 to release1.3 branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f6614183
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f6614183
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f6614183
Branch: refs/heads/master
Commit: f66141834f102e9af39cf9baf3bc3f9c27118133
Parents: 26031c8
Author: Roberta Marton <ro...@esgyn.com>
Authored: Tue Dec 1 17:55:29 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Tue Dec 1 17:55:29 2015 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f6614183/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index 298003b..902b314 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -136,7 +136,8 @@ echo "***INFO: untarring build file $DCS_BUILD_FILE"
tar -xzf $DCS_BUILD_FILE
# get the dcs install directory name which is imbedded in the tar file
-DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep LICENSE | sed -e "s@\(^.*\)/LICENSE.txt@\1@")
+DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep --max-count=1 bin | sed -e "s@\(^.*\)/bin/@\1@")
+
DCS_DIR=$DCS_INSTALL_PATH/$DCS_DIR
# set env var in sqenvcom.sh for DCS install directory