Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-6630. hadoop-config.sh fails to get executed if hadoop wrapper scripts are in path. Contributed by Allen Wittenauer. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@939510 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2010-04-29 23:23:53 +00:00
parent f6acb32e06
commit f8f275c1ad
14 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -382,6 +382,9 @@ Trunk (unreleased changes)
HADOOP-6709. Re-instate deprecated FileSystem methods that were removed
after 0.20. (tomwhite)
HADOOP-6630. hadoop-config.sh fails to get executed if hadoop wrapper
scripts are in path. (Allen Wittenauer via tomwhite)
Release 0.21.0 - Unreleased
INCOMPATIBLE CHANGES

2
bin/hadoop-config.sh
View File

@ -19,7 +19,7 @@
# resolve links - $0 may be a softlink
this="$0"
this="${BASH_SOURCE-$0}"
while [ -h "$this" ]; do
ls=`ls -ld "$this"`
link=`expr "$ls" : '.*-> \(.*\)$'`

2
bin/hadoop-daemon.sh
View File

@ -36,7 +36,7 @@ if [ $# -le 1 ]; then
exit 1
fi
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-config.sh

2
bin/hadoop-daemons.sh
View File

@ -26,7 +26,7 @@ if [ $# -le 1 ]; then
exit 1
fi
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. $bin/hadoop-config.sh

2
bin/rcc
View File

@ -27,7 +27,7 @@
# HADOOP_CONF_DIR Alternate conf dir. Default is ${HADOOP_HOME}/conf.
#
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-config.sh

2
bin/slaves.sh
View File

@ -35,7 +35,7 @@ if [ $# -le 0 ]; then
exit 1
fi
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-config.sh

2
bin/start-all.sh
View File

@ -20,7 +20,7 @@
echo "This script is Deprecated. Instead use start-dfs.sh and start-mapred.sh"
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-config.sh

2
bin/start-balancer.sh
View File

@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hdfs-config.sh

2
bin/start-dfs.sh
View File

@ -22,7 +22,7 @@
usage="Usage: start-dfs.sh [-upgrade|-rollback]"
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hdfs-config.sh

2
bin/start-mapred.sh
View File

@ -18,7 +18,7 @@
# Start hadoop map reduce daemons. Run this on master node.
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. $bin/mapred-config.sh

2
bin/stop-all.sh
View File

@ -20,7 +20,7 @@
echo "This script is Deprecated. Instead use stop-dfs.sh and stop-mapred.sh"
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-config.sh

2
bin/stop-balancer.sh
View File

@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hdfs-config.sh

2
bin/stop-dfs.sh
View File

@ -18,7 +18,7 @@
# Stop hadoop DFS daemons. Run this on master node.
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hdfs-config.sh

2
bin/stop-mapred.sh
View File

@ -18,7 +18,7 @@
# Stop hadoop map reduce daemons. Run this on master node.
bin=`dirname "$0"`
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. $bin/mapred-config.sh