Browse Source

HADOOP-469. Fix /bin/bash specifics that have crept into our /bin/sh scripts since HADOOP-352. Contributed by Jean-Baptiste Quenot.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@433335 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 years ago
parent
commit
e177ca78c0
12 changed files with 15 additions and 11 deletions
  1. 4 0
      CHANGES.txt
  2. 1 1
      bin/hadoop
  3. 1 1
      bin/hadoop-daemon.sh
  4. 1 1
      bin/hadoop-daemons.sh
  5. 1 1
      bin/rcc
  6. 1 1
      bin/slaves.sh
  7. 1 1
      bin/start-all.sh
  8. 1 1
      bin/start-dfs.sh
  9. 1 1
      bin/start-mapred.sh
  10. 1 1
      bin/stop-all.sh
  11. 1 1
      bin/stop-dfs.sh
  12. 1 1
      bin/stop-mapred.sh

+ 4 - 0
CHANGES.txt

@@ -61,6 +61,10 @@ Trunk (unreleased changes)
 14. HADOOP-464.  Improved error message when job jar not found.
     (Michel Tourn via cutting)
 
+15. HADOOP-469.  Fix /bin/bash specifics that have crept into our
+    /bin/sh scripts since HADOOP-352.
+    (Jean-Baptiste Quenot via cutting)
+
 
 Release 0.5.0 - 2006-08-04
 

+ 1 - 1
bin/hadoop

@@ -19,7 +19,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source "$bin"/hadoop-config.sh
+. "$bin"/hadoop-config.sh
 
 # if no args specified, show usage
 if [ $# = 0 ]; then

+ 1 - 1
bin/hadoop-daemon.sh

@@ -22,7 +22,7 @@ fi
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source "$bin"/hadoop-config.sh
+. "$bin"/hadoop-config.sh
 
 # get arguments
 startStop=$1

+ 1 - 1
bin/hadoop-daemons.sh

@@ -13,6 +13,6 @@ fi
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source $bin/hadoop-config.sh
+. $bin/hadoop-config.sh
 
 exec "$bin/slaves.sh" --config $HADOOP_CONF_DIR cd "$HADOOP_HOME" \; "$bin/hadoop-daemon.sh" --config $HADOOP_CONF_DIR "$@"

+ 1 - 1
bin/rcc

@@ -14,7 +14,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source "$bin"/hadoop-config.sh
+. "$bin"/hadoop-config.sh
 
 if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
   . "${HADOOP_CONF_DIR}/hadoop-env.sh"

+ 1 - 1
bin/slaves.sh

@@ -22,7 +22,7 @@ fi
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source "$bin"/hadoop-config.sh
+. "$bin"/hadoop-config.sh
 
 if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
   . "${HADOOP_CONF_DIR}/hadoop-env.sh"

+ 1 - 1
bin/start-all.sh

@@ -5,7 +5,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source "$bin"/hadoop-config.sh
+. "$bin"/hadoop-config.sh
 
 # start dfs daemons
 "$bin"/start-dfs.sh --config $HADOOP_CONF_DIR

+ 1 - 1
bin/start-dfs.sh

@@ -5,7 +5,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source "$bin"/hadoop-config.sh
+. "$bin"/hadoop-config.sh
 
 # start dfs daemons
 # start namenode after datanodes, to minimize time namenode is up w/o data

+ 1 - 1
bin/start-mapred.sh

@@ -5,7 +5,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source "$bin"/hadoop-config.sh
+. "$bin"/hadoop-config.sh
 
 # start mapred daemons
 # start jobtracker first to minimize connection errors at startup

+ 1 - 1
bin/stop-all.sh

@@ -5,7 +5,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source "$bin"/hadoop-config.sh
+. "$bin"/hadoop-config.sh
 
 "$bin"/stop-mapred.sh --config $HADOOP_CONF_DIR
 "$bin"/stop-dfs.sh --config $HADOOP_CONF_DIR

+ 1 - 1
bin/stop-dfs.sh

@@ -5,7 +5,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source "$bin"/hadoop-config.sh
+. "$bin"/hadoop-config.sh
 
 "$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR stop namenode
 "$bin"/hadoop-daemons.sh --config $HADOOP_CONF_DIR stop datanode

+ 1 - 1
bin/stop-mapred.sh

@@ -5,7 +5,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-source "$bin"/hadoop-config.sh
+. "$bin"/hadoop-config.sh
 
 "$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR stop jobtracker
 "$bin"/hadoop-daemons.sh --config $HADOOP_CONF_DIR stop tasktracker