You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cu...@apache.org on 2007/08/23 04:19:20 UTC
svn commit: r568809 - in /lucene/hadoop/trunk: ./ bin/ src/contrib/ec2/bin/
src/contrib/hbase/bin/
Author: cutting
Date: Wed Aug 22 19:19:18 2007
New Revision: 568809
URL: http://svn.apache.org/viewvc?rev=568809&view=rev
Log:
HADOOP-1689. Make shell scripts more portable.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/bin/hadoop
lucene/hadoop/trunk/bin/hadoop-daemon.sh
lucene/hadoop/trunk/bin/hadoop-daemons.sh
lucene/hadoop/trunk/bin/rcc
lucene/hadoop/trunk/bin/slaves.sh
lucene/hadoop/trunk/bin/start-all.sh
lucene/hadoop/trunk/bin/start-dfs.sh
lucene/hadoop/trunk/bin/start-mapred.sh
lucene/hadoop/trunk/bin/stop-all.sh
lucene/hadoop/trunk/bin/stop-dfs.sh
lucene/hadoop/trunk/bin/stop-mapred.sh
lucene/hadoop/trunk/src/contrib/ec2/bin/create-hadoop-image
lucene/hadoop/trunk/src/contrib/ec2/bin/hadoop-ec2
lucene/hadoop/trunk/src/contrib/ec2/bin/launch-hadoop-cluster
lucene/hadoop/trunk/src/contrib/ec2/bin/login-hadoop-cluster
lucene/hadoop/trunk/src/contrib/ec2/bin/run-hadoop-cluster
lucene/hadoop/trunk/src/contrib/ec2/bin/start-hadoop
lucene/hadoop/trunk/src/contrib/ec2/bin/terminate-hadoop-cluster
lucene/hadoop/trunk/src/contrib/hbase/bin/hbase
lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh
lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh
lucene/hadoop/trunk/src/contrib/hbase/bin/regionservers.sh
lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh
lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh
Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Aug 22 19:19:18 2007
@@ -78,6 +78,11 @@
HADOOP-1731. Add Hadoop's version to contrib jar file names.
(cutting)
+ HADOOP-1689. Make shell scripts more portable. All shell scripts
+ now explicitly depend on bash, but do not require that bash be
+ installed in a particular location, as long as it is on $PATH.
+ (cutting)
+
Release 0.14.0 - 2007-08-17
Modified: lucene/hadoop/trunk/bin/hadoop
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/hadoop?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/hadoop (original)
+++ lucene/hadoop/trunk/bin/hadoop Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
#
# The Hadoop command script
#
Modified: lucene/hadoop/trunk/bin/hadoop-daemon.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/hadoop-daemon.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/hadoop-daemon.sh (original)
+++ lucene/hadoop/trunk/bin/hadoop-daemon.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
#
# Runs a Hadoop command as a daemon.
#
Modified: lucene/hadoop/trunk/bin/hadoop-daemons.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/hadoop-daemons.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/hadoop-daemons.sh (original)
+++ lucene/hadoop/trunk/bin/hadoop-daemons.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
#
# Run a Hadoop command on all slave hosts.
Modified: lucene/hadoop/trunk/bin/rcc
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/rcc?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/rcc (original)
+++ lucene/hadoop/trunk/bin/rcc Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
#
# The Hadoop record compiler
#
Modified: lucene/hadoop/trunk/bin/slaves.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/slaves.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/slaves.sh (original)
+++ lucene/hadoop/trunk/bin/slaves.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Run a shell command on all slave hosts.
#
Modified: lucene/hadoop/trunk/bin/start-all.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/start-all.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/start-all.sh (original)
+++ lucene/hadoop/trunk/bin/start-all.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Start all hadoop daemons. Run this on master node.
Modified: lucene/hadoop/trunk/bin/start-dfs.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/start-dfs.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/start-dfs.sh (original)
+++ lucene/hadoop/trunk/bin/start-dfs.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Start hadoop dfs daemons.
# Optinally upgrade or rollback dfs state.
Modified: lucene/hadoop/trunk/bin/start-mapred.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/start-mapred.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/start-mapred.sh (original)
+++ lucene/hadoop/trunk/bin/start-mapred.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Start hadoop map reduce daemons. Run this on master node.
Modified: lucene/hadoop/trunk/bin/stop-all.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/stop-all.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/stop-all.sh (original)
+++ lucene/hadoop/trunk/bin/stop-all.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Stop all hadoop daemons. Run this on master node.
Modified: lucene/hadoop/trunk/bin/stop-dfs.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/stop-dfs.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/stop-dfs.sh (original)
+++ lucene/hadoop/trunk/bin/stop-dfs.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Stop hadoop DFS daemons. Run this on master node.
Modified: lucene/hadoop/trunk/bin/stop-mapred.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/stop-mapred.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/bin/stop-mapred.sh (original)
+++ lucene/hadoop/trunk/bin/stop-mapred.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Stop hadoop map reduce daemons. Run this on master node.
Modified: lucene/hadoop/trunk/src/contrib/ec2/bin/create-hadoop-image
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/ec2/bin/create-hadoop-image?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/ec2/bin/create-hadoop-image (original)
+++ lucene/hadoop/trunk/src/contrib/ec2/bin/create-hadoop-image Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Create a Hadoop AMI.
# Inspired by Jonathan Siegel's EC2 script (http://blogsiegel.blogspot.com/2006/08/sandboxing-amazon-ec2.html)
Modified: lucene/hadoop/trunk/src/contrib/ec2/bin/hadoop-ec2
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/ec2/bin/hadoop-ec2?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/ec2/bin/hadoop-ec2 (original)
+++ lucene/hadoop/trunk/src/contrib/ec2/bin/hadoop-ec2 Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
bin=`dirname "$0"`
bin=`cd "$bin"; pwd`
@@ -33,4 +33,4 @@
elif [ "$COMMAND" = "terminate-cluster" ] ; then
. "$bin"/terminate-hadoop-cluster
fi
-
\ No newline at end of file
+
Modified: lucene/hadoop/trunk/src/contrib/ec2/bin/launch-hadoop-cluster
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/ec2/bin/launch-hadoop-cluster?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/ec2/bin/launch-hadoop-cluster (original)
+++ lucene/hadoop/trunk/src/contrib/ec2/bin/launch-hadoop-cluster Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Launch an EC2 cluster of Hadoop instances.
# Import variables
Modified: lucene/hadoop/trunk/src/contrib/ec2/bin/login-hadoop-cluster
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/ec2/bin/login-hadoop-cluster?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/ec2/bin/login-hadoop-cluster (original)
+++ lucene/hadoop/trunk/src/contrib/ec2/bin/login-hadoop-cluster Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Login to the master node of a running Hadoop EC2 cluster.
# Import variables
Modified: lucene/hadoop/trunk/src/contrib/ec2/bin/run-hadoop-cluster
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/ec2/bin/run-hadoop-cluster?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/ec2/bin/run-hadoop-cluster (original)
+++ lucene/hadoop/trunk/src/contrib/ec2/bin/run-hadoop-cluster Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Launch an EC2 cluster of Hadoop instances, start Hadoop, and connect to the master.
# Import variables
@@ -15,4 +15,4 @@
echo "Waiting before trying to connect..."
sleep 30
-"$bin"/start-hadoop
\ No newline at end of file
+"$bin"/start-hadoop
Modified: lucene/hadoop/trunk/src/contrib/ec2/bin/start-hadoop
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/ec2/bin/start-hadoop?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/ec2/bin/start-hadoop (original)
+++ lucene/hadoop/trunk/src/contrib/ec2/bin/start-hadoop Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Start Hadoop on a cluster.
# Import variables
Modified: lucene/hadoop/trunk/src/contrib/ec2/bin/terminate-hadoop-cluster
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/ec2/bin/terminate-hadoop-cluster?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/ec2/bin/terminate-hadoop-cluster (original)
+++ lucene/hadoop/trunk/src/contrib/ec2/bin/terminate-hadoop-cluster Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# Terminate a cluster.
# Import variables
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/hbase
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/hbase?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/hbase (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/hbase Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /usr/bin/env bash
#
#/**
# * Copyright 2007 The Apache Software Foundation
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
#
#/**
# * Copyright 2007 The Apache Software Foundation
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
#
#/**
# * Copyright 2007 The Apache Software Foundation
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/regionservers.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/regionservers.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/regionservers.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/regionservers.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
#/**
# * Copyright 2007 The Apache Software Foundation
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
#
#/**
# * Copyright 2007 The Apache Software Foundation
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh?rev=568809&r1=568808&r2=568809&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh Wed Aug 22 19:19:18 2007
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
#
#/**
# * Copyright 2007 The Apache Software Foundation