瀏覽代碼

HADOOP-352. Fix shell scripts to use /bin/sh instead of /bin/bash for better portability. Contributed by Jean-Baptiste Quenot.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@420758 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 19 年之前
父節點
當前提交
10ce3051e6
共有 12 個文件被更改,包括 25 次插入18 次删除
  1. 7 0
      CHANGES.txt
  2. 2 2
      bin/hadoop
  3. 5 5
      bin/hadoop-daemon.sh
  4. 1 1
      bin/hadoop-daemons.sh
  5. 2 2
      bin/rcc
  6. 2 2
      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

+ 7 - 0
CHANGES.txt

@@ -1,6 +1,13 @@
 Hadoop Change Log
 
 
+Trunk (unreleased changes)
+
+ 1. HADOOP-352.  Fix shell scripts to use /bin/sh instead of
+    /bin/bash, for better portability.
+    (Jean-Baptiste Quenot via cutting)
+
+
 Release 0.4.0 - 2006-06-28
 
  1. HADOOP-298.  Improved progress reports for CopyFiles utility, the

+ 2 - 2
bin/hadoop

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # 
 # The Hadoop command script
 #
@@ -60,7 +60,7 @@ export HADOOP_HOME=`cd "$THIS_DIR/.." ; pwd`
 HADOOP_CONF_DIR="${HADOOP_CONF_DIR:-$HADOOP_HOME/conf}"
 
 if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
-  source "${HADOOP_CONF_DIR}/hadoop-env.sh"
+  . "${HADOOP_CONF_DIR}/hadoop-env.sh"
 fi
 
 # some Java parameters

+ 5 - 5
bin/hadoop-daemon.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # 
 # Runs a Hadoop command as a daemon.
 #
@@ -44,7 +44,7 @@ export HADOOP_HOME=`dirname "$this"`/..
 HADOOP_CONF_DIR="${HADOOP_CONF_DIR:-$HADOOP_HOME/conf}"
 
 if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
-  source "${HADOOP_CONF_DIR}/hadoop-env.sh"
+  . "${HADOOP_CONF_DIR}/hadoop-env.sh"
 fi
 
 # get log directory
@@ -72,7 +72,7 @@ case $startStop in
   (start)
 
     if [ -f $pid ]; then
-      if [ -a /proc/`cat $pid` ]; then
+      if ps -p `cat $pid` > /dev/null 2>&1; then
         echo $command running as process `cat $pid`.  Stop it first.
         exit 1
       fi
@@ -84,7 +84,7 @@ case $startStop in
     fi
 
     echo starting $command, logging to $log
-    nohup "$HADOOP_HOME"/bin/hadoop $command "$@" >& "$log" < /dev/null &
+    nohup "$HADOOP_HOME"/bin/hadoop $command "$@" > "$log" 2>&1 < /dev/null &
     echo $! > $pid
     sleep 1; head "$log"
     ;;
@@ -92,7 +92,7 @@ case $startStop in
   (stop)
 
     if [ -f $pid ]; then
-      if [ -a /proc/`cat $pid` ]; then
+      if ps -p `cat $pid` > /dev/null 2>&1; then
         echo stopping $command
         kill `cat $pid`
       else

+ 1 - 1
bin/hadoop-daemons.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # 
 # Run a Hadoop command on all slave hosts.
 

+ 2 - 2
bin/rcc

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # 
 # The Hadoop record compiler
 #
@@ -31,7 +31,7 @@ HADOOP_HOME=`cd "$THIS_DIR/.." ; pwd`
 HADOOP_CONF_DIR="${HADOOP_CONF_DIR:-$HADOOP_HOME/conf}"
 
 if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
-  source "${HADOOP_CONF_DIR}/hadoop-env.sh"
+  . "${HADOOP_CONF_DIR}/hadoop-env.sh"
 fi
 
 # some Java parameters

+ 2 - 2
bin/slaves.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # 
 # Run a shell command on all slave hosts.
 #
@@ -38,7 +38,7 @@ HADOOP_HOME=`dirname "$this"`/..
 HADOOP_CONF_DIR="${HADOOP_CONF_DIR:=$HADOOP_HOME/conf}"
 
 if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
-  source "${HADOOP_CONF_DIR}/hadoop-env.sh"
+  . "${HADOOP_CONF_DIR}/hadoop-env.sh"
 fi
 
 if [ "$HADOOP_SLAVES" = "" ]; then

+ 1 - 1
bin/start-all.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Start all hadoop daemons.  Run this on master node.
 

+ 1 - 1
bin/start-dfs.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Start hadoop dfs daemons.  Run this on master node.
 

+ 1 - 1
bin/start-mapred.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Start hadoop map reduce daemons.  Run this on master node.
 

+ 1 - 1
bin/stop-all.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Stop all hadoop daemons.  Run this on master node.
 

+ 1 - 1
bin/stop-dfs.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Stop hadoop DFS daemons.  Run this on master node.
 

+ 1 - 1
bin/stop-mapred.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Stop hadoop map reduce daemons.  Run this on master node.