You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ma...@apache.org on 2013/10/01 21:53:57 UTC
git commit: BIGTOP-1103. Remaining fixes of BIGTOP_DEFAULT_DIR
evaluation
Updated Branches:
refs/heads/master 077d35f2e -> 67f1508cc
BIGTOP-1103. Remaining fixes of BIGTOP_DEFAULT_DIR evaluation
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/67f1508c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/67f1508c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/67f1508c
Branch: refs/heads/master
Commit: 67f1508cc8f7a6e7b6ed18d2b573741a67cc2556
Parents: 077d35f
Author: Sean Mackrory <se...@cloudera.com>
Authored: Tue Oct 1 12:52:37 2013 -0700
Committer: Sean Mackrory <se...@cloudera.com>
Committed: Tue Oct 1 12:52:37 2013 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/hadoop/install_hadoop.sh | 2 +-
bigtop-packages/src/common/hbase/install_hbase.sh | 4 ++--
bigtop-packages/src/common/hcatalog/install_hcatalog.sh | 6 +++---
bigtop-packages/src/common/hive/install_hive.sh | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/67f1508c/bigtop-packages/src/common/hadoop/install_hadoop.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/install_hadoop.sh b/bigtop-packages/src/common/hadoop/install_hadoop.sh
index 8e2a07d..9d51dda 100755
--- a/bigtop-packages/src/common/hadoop/install_hadoop.sh
+++ b/bigtop-packages/src/common/hadoop/install_hadoop.sh
@@ -267,7 +267,7 @@ cat > $fuse_wrapper << EOF
export HADOOP_HOME=\${HADOOP_HOME:-${HADOOP_DIR#${PREFIX}}}
BIGTOP_DEFAULTS_DIR=\${BIGTOP_DEFAULTS_DIR-/etc/default}
-[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/hadoop-fuse ] && . ${BIGTOP_DEFAULTS_DIR}/hadoop-fuse
+[ -n "\${BIGTOP_DEFAULTS_DIR}" -a -r \${BIGTOP_DEFAULTS_DIR}/hadoop-fuse ] && . \${BIGTOP_DEFAULTS_DIR}/hadoop-fuse
export HADOOP_LIBEXEC_DIR=${SYSTEM_LIBEXEC_DIR#${PREFIX}}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/67f1508c/bigtop-packages/src/common/hbase/install_hbase.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/install_hbase.sh b/bigtop-packages/src/common/hbase/install_hbase.sh
index 5b3f882..e2d8a0e 100755
--- a/bigtop-packages/src/common/hbase/install_hbase.sh
+++ b/bigtop-packages/src/common/hbase/install_hbase.sh
@@ -140,8 +140,8 @@ mkdir -p `dirname $wrapper`
cat > $wrapper <<EOF
#!/bin/bash
-BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default}
-[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/hbase ] && . ${BIGTOP_DEFAULTS_DIR}/hbase
+BIGTOP_DEFAULTS_DIR=\${BIGTOP_DEFAULTS_DIR-/etc/default}
+[ -n "\${BIGTOP_DEFAULTS_DIR}" -a -r \${BIGTOP_DEFAULTS_DIR}/hbase ] && . \${BIGTOP_DEFAULTS_DIR}/hbase
# Autodetect JAVA_HOME if not defined
. /usr/lib/bigtop-utils/bigtop-detect-javahome
http://git-wip-us.apache.org/repos/asf/bigtop/blob/67f1508c/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hcatalog/install_hcatalog.sh b/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
index a322fb9..45c89d9 100644
--- a/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
+++ b/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
@@ -116,9 +116,9 @@ wrapper=${PREFIX}/$BIN_DIR/hcat
cat >>$wrapper <<EOF
#!/bin/bash
-BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default}
-[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/hadoop ] && . ${BIGTOP_DEFAULTS_DIR}/hadoop
-[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/hbase ] && . ${BIGTOP_DEFAULTS_DIR}/hbase
+BIGTOP_DEFAULTS_DIR=\${BIGTOP_DEFAULTS_DIR-/etc/default}
+[ -n "\${BIGTOP_DEFAULTS_DIR}" -a -r \${BIGTOP_DEFAULTS_DIR}/hadoop ] && . \${BIGTOP_DEFAULTS_DIR}/hadoop
+[ -n "\${BIGTOP_DEFAULTS_DIR}" -a -r \${BIGTOP_DEFAULTS_DIR}/hbase ] && . \${BIGTOP_DEFAULTS_DIR}/hbase
# Autodetect JAVA_HOME if not defined
. /usr/lib/bigtop-utils/bigtop-detect-javahome
http://git-wip-us.apache.org/repos/asf/bigtop/blob/67f1508c/bigtop-packages/src/common/hive/install_hive.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/install_hive.sh b/bigtop-packages/src/common/hive/install_hive.sh
index 50bbe64..123645d 100755
--- a/bigtop-packages/src/common/hive/install_hive.sh
+++ b/bigtop-packages/src/common/hive/install_hive.sh
@@ -123,8 +123,8 @@ do
# Autodetect JAVA_HOME if not defined
. /usr/lib/bigtop-utils/bigtop-detect-javahome
-BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default}
-[ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/hbase ] && . ${BIGTOP_DEFAULTS_DIR}/hbase
+BIGTOP_DEFAULTS_DIR=\${BIGTOP_DEFAULTS_DIR-/etc/default}
+[ -n "\${BIGTOP_DEFAULTS_DIR}" -a -r \${BIGTOP_DEFAULTS_DIR}/hbase ] && . \${BIGTOP_DEFAULTS_DIR}/hbase
export HIVE_HOME=$INSTALLED_LIB_DIR
exec $INSTALLED_LIB_DIR/bin/$file "\$@"