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 2016/05/25 20:34:50 UTC
[28/39] incubator-trafodion git commit: TRAFODION-1993 Expand DCS and
REST directories
TRAFODION-1993 Expand DCS and REST directories
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/95c553a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/95c553a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/95c553a9
Branch: refs/heads/master
Commit: 95c553a91772f4a8908655887ede11c539c6ed7c
Parents: 19b8d1f
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 19:14:03 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 19:14:03 2016 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 3 ++-
install/installer/rest_installer | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/95c553a9/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index cf5e744..fa07753 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -131,7 +131,8 @@ mkdir -p $DCS_INSTALL_PATH
cd $DCS_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- DCS_DIR="$SQ_ROOT/dcs*"
+ DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs)
+ DCS_DIR=$SQ_ROOT/$DCS_DIR
else
# untar DCS build into install directory
echo "***INFO: untarring build file $DCS_BUILD_FILE"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/95c553a9/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index e3cde2e..a9af0a0 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -94,7 +94,8 @@ mkdir -p $REST_INSTALL_PATH
cd $REST_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- REST_DIR="$SQ_ROOT/rest*"
+ REST_DIR=$(sudo ls $SQ_ROOT | grep rest)
+ REST_DIR=$($SQ_ROOT/$REST_DIR)
else
# untar REST build into install directory
echo "***INFO: untarring build file $REST_BUILD_FILE"