LENS-618: Add consistend shebang in shell scripts (Rajat Khandelwal via Raghavendra Singh)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/5d20751d Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/5d20751d Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/5d20751d Branch: refs/heads/current-release-line Commit: 5d20751d3620313dc27df53daa4662d8fac7fd20 Parents: 86969ba Author: Rajat Khandelwal <[email protected]> Authored: Fri Jun 19 19:04:39 2015 +0530 Committer: raghavendra.singh <[email protected]> Committed: Fri Jun 19 19:04:39 2015 +0530 ---------------------------------------------------------------------- .../src/deb/control/server-control/postinst | 2 +- lens-docker/lens-test/lens-bootstrap.sh | 8 +++--- lens-ml-lib/tools/scripts/lens-ml-classpath.sh | 2 +- tools/conf-pseudo-distr/lens-env.sh | 3 ++- tools/conf/lens-env.sh | 3 ++- tools/scripts/build-docker.sh | 2 +- tools/scripts/generate-site-public.sh | 2 +- tools/scripts/lens-cli | 2 +- tools/scripts/lens-cli.sh | 2 +- tools/scripts/lens-config.sh | 2 +- tools/scripts/lens-ctl | 26 ++++++++++---------- tools/scripts/lens-run-class.sh | 12 ++++----- tools/scripts/run-docker.sh | 1 + tools/scripts/run-examples.sh | 2 +- 14 files changed, 36 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/lens-dist/src/deb/control/server-control/postinst ---------------------------------------------------------------------- diff --git a/lens-dist/src/deb/control/server-control/postinst b/lens-dist/src/deb/control/server-control/postinst index 5d1f976..44a4260 100644 --- a/lens-dist/src/deb/control/server-control/postinst +++ b/lens-dist/src/deb/control/server-control/postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/lens-docker/lens-test/lens-bootstrap.sh ---------------------------------------------------------------------- diff --git a/lens-docker/lens-test/lens-bootstrap.sh b/lens-docker/lens-test/lens-bootstrap.sh index 3407dca..d4b4788 100644 --- a/lens-docker/lens-test/lens-bootstrap.sh +++ b/lens-docker/lens-test/lens-bootstrap.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one or more @@ -23,7 +23,7 @@ echo "LENS_CLIENT " $LENS_CLIENT echo "LENS_CLIENT_CONF " $LENS_CLIENT_CONF echo "LENS_ML " $LENS_ML echo "SPARK_HOME " $SPARK_HOME - + #set ml classpath into LENS_EXT_CLASSPATH LENS_EXT_CLASSPATH=$LENS_EXT_CLASSPATH:`$LENS_ML/bin/lens-ml-classpath.sh` export LENS_EXT_CLASSPATH @@ -45,7 +45,7 @@ sleep 20 #start lens server echo "Starting Lens server..." -$LENS_HOME/bin/lens-ctl start --conf $LENS_SERVER_CONF +$LENS_HOME/bin/lens-ctl start --conf $LENS_SERVER_CONF echo "Waiting for 60 secs for Lens Server to start ..." sleep 60 @@ -55,4 +55,4 @@ $LENS_CLIENT/bin/run-examples.sh sample-metastore --conf $LENS_CLIENT_CONF $LENS_CLIENT/bin/run-examples.sh populate-metastore --conf $LENS_CLIENT_CONF $LENS_CLIENT/bin/lens-cli.sh --conf $LENS_CLIENT_CONF -/bin/bash +/usr/bin/env bash http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/lens-ml-lib/tools/scripts/lens-ml-classpath.sh ---------------------------------------------------------------------- diff --git a/lens-ml-lib/tools/scripts/lens-ml-classpath.sh b/lens-ml-lib/tools/scripts/lens-ml-classpath.sh index 7254b78..88d62b4 100644 --- a/lens-ml-lib/tools/scripts/lens-ml-classpath.sh +++ b/lens-ml-lib/tools/scripts/lens-ml-classpath.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/conf-pseudo-distr/lens-env.sh ---------------------------------------------------------------------- diff --git a/tools/conf-pseudo-distr/lens-env.sh b/tools/conf-pseudo-distr/lens-env.sh index 6a6222c..456e001 100644 --- a/tools/conf-pseudo-distr/lens-env.sh +++ b/tools/conf-pseudo-distr/lens-env.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -17,7 +18,7 @@ # under the License. # -# The hadoop installation location. +# The hadoop installation location. #export HADOOP_HOME= # The Hive installation location. Lens adds hive lib in the classpath. http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/conf/lens-env.sh ---------------------------------------------------------------------- diff --git a/tools/conf/lens-env.sh b/tools/conf/lens-env.sh index 6a6222c..456e001 100644 --- a/tools/conf/lens-env.sh +++ b/tools/conf/lens-env.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -17,7 +18,7 @@ # under the License. # -# The hadoop installation location. +# The hadoop installation location. #export HADOOP_HOME= # The Hive installation location. Lens adds hive lib in the classpath. http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/scripts/build-docker.sh ---------------------------------------------------------------------- diff --git a/tools/scripts/build-docker.sh b/tools/scripts/build-docker.sh index 31fbac2..8cfda11 100755 --- a/tools/scripts/build-docker.sh +++ b/tools/scripts/build-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one or more http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/scripts/generate-site-public.sh ---------------------------------------------------------------------- diff --git a/tools/scripts/generate-site-public.sh b/tools/scripts/generate-site-public.sh index 75f86b0..0f2e45c 100755 --- a/tools/scripts/generate-site-public.sh +++ b/tools/scripts/generate-site-public.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/scripts/lens-cli ---------------------------------------------------------------------- diff --git a/tools/scripts/lens-cli b/tools/scripts/lens-cli index 18695ef..0f3c946 100644 --- a/tools/scripts/lens-cli +++ b/tools/scripts/lens-cli @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # # Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/scripts/lens-cli.sh ---------------------------------------------------------------------- diff --git a/tools/scripts/lens-cli.sh b/tools/scripts/lens-cli.sh index e6eb34c..8b490e8 100644 --- a/tools/scripts/lens-cli.sh +++ b/tools/scripts/lens-cli.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/scripts/lens-config.sh ---------------------------------------------------------------------- diff --git a/tools/scripts/lens-config.sh b/tools/scripts/lens-config.sh index b901fbb..64b1f00 100644 --- a/tools/scripts/lens-config.sh +++ b/tools/scripts/lens-config.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/scripts/lens-ctl ---------------------------------------------------------------------- diff --git a/tools/scripts/lens-ctl b/tools/scripts/lens-ctl index 1335469..822ead8 100755 --- a/tools/scripts/lens-ctl +++ b/tools/scripts/lens-ctl @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -64,14 +64,14 @@ display_help() { Usage: $0 start // Start the server $0 stop // Stop the server $0 restart // Restart the server, stop followed by stop - $0 force [stop|restart] // Forcefully stop the server + $0 force [stop|restart] // Forcefully stop the server $0 status // Server status $0 stack // Dump the thread stacks $0 memory-histogram // Server's memory histogram $0 memory-dump // Server's memory dump dumped to file in log directory - + Optional parameters for the commands --conf/-c, --classpath/-C, -D, --verbose/-v - + EOF } @@ -122,18 +122,18 @@ start() { LENSCPPATH=${LENSCPPATH}:$HADOOP_JARPATH fi - if [ "$HIVE_HOME" != "" ]; then + if [ "$HIVE_HOME" != "" ]; then echo "HIVE_HOME is set, adding ${HIVE_HOME}/lib/* into lens classpath" LENSCPPATH=${LENSCPPATH}:`ls ${HIVE_HOME}/lib/* 2>/dev/null | tr "\n" ':' 2>/dev/null` else echo "HIVE_HOME is not set. Set HIVE_HOME and try again" exit 1 fi - + # Add HIVE_HOME to HADOOP_CLASS_PATH HADOOP_CLASSPATH="$HADOOP_CLASSPATH:${HIVE_HOME}/lib/*" export HADOOP_CLASSPATH - + mkdir -p $LENS_LOG_DIR JAVA_PROPERTIES="${JAVA_PROPERTIES} $LENS_OPTS $LENS_PROPERTIES -Dlens.log.dir=$LENS_LOG_DIR -Dlens.home=${LENS_HOME_DIR} -Dconfig.location=$LENS_CONF" @@ -147,7 +147,7 @@ start() { if [ -n "$opt_verbose" ] ; then JAVA_PROPERTIES="-Dlensserver.root.logger=INFO,CONSOLE -Dlensserver.request.logger=INFO,CONSOLE ${JAVA_PROPERTIES}" ${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${LENSCPPATH} org.apache.lens.server.LensServer $* - else + else pushd ${BASEDIR} > /dev/null TIME=`date +%Y%m%d%H%M%s` @@ -175,13 +175,13 @@ stop() { kill -15 `cat $LENS_PID_FILE` fi while : - do + do if kill -0 `cat $LENS_PID_FILE` > /dev/null 2>&1; then echo -n "." sleep 1 else break - fi + fi done rm -rf $LENS_PID_FILE echo Stopped lens server! @@ -199,7 +199,7 @@ status() { exit 0 else exit -2 - fi + fi else echo "pid file $LENS_PID_FILE not present" exit -1 @@ -230,7 +230,7 @@ memory_histo() { exit 0 else exit -2 - fi + fi else echo "pid file $LENS_PID_FILE not present" exit -1 @@ -245,7 +245,7 @@ memory_dump() { exit 0 else exit -2 - fi + fi else echo "pid file $LENS_PID_FILE not present" exit -1 http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/scripts/lens-run-class.sh ---------------------------------------------------------------------- diff --git a/tools/scripts/lens-run-class.sh b/tools/scripts/lens-run-class.sh index ef64b03..698c51e 100644 --- a/tools/scripts/lens-run-class.sh +++ b/tools/scripts/lens-run-class.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -101,18 +101,18 @@ setenv() { LENSCPPATH=${LENSCPPATH}:$HADOOP_JARPATH fi - if [ "$HIVE_HOME" != "" ]; then + if [ "$HIVE_HOME" != "" ]; then echo "HIVE_HOME is set, adding ${HIVE_HOME}/lib/* into lens classpath" LENSCPPATH=${LENSCPPATH}:`ls ${HIVE_HOME}/lib/* 2>/dev/null | tr "\n" ':' 2>/dev/null` else echo "HIVE_HOME is not set. Set HIVE_HOME and try again" exit 1 fi - + # Add HIVE_HOME to HADOOP_CLASS_PATH HADOOP_CLASSPATH="$HADOOP_CLASSPATH:${HIVE_HOME}/lib/*" export HADOOP_CLASSPATH - + } ################################ # main @@ -138,7 +138,7 @@ while [ -n "$*" ] ; do JAVA_PROPERTIES="${JAVA_PROPERTIES} $arg" ;; *) - if [ "$opt_classname" == "" ]; then + if [ "$opt_classname" == "" ]; then opt_classname=$arg echo "opt_classname is " $opt_classname else @@ -156,7 +156,7 @@ if [ -n "$opt_conf" ]; then fi # finally, invoke the appropriate command -if [ "$opt_classname" == "" ]; then +if [ "$opt_classname" == "" ]; then echo "Usage : $0 <classname>" exit 1 fi http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/scripts/run-docker.sh ---------------------------------------------------------------------- diff --git a/tools/scripts/run-docker.sh b/tools/scripts/run-docker.sh index 3372d43..8c701a3 100755 --- a/tools/scripts/run-docker.sh +++ b/tools/scripts/run-docker.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/5d20751d/tools/scripts/run-examples.sh ---------------------------------------------------------------------- diff --git a/tools/scripts/run-examples.sh b/tools/scripts/run-examples.sh index 0e8af6a..f05c1c0 100644 --- a/tools/scripts/run-examples.sh +++ b/tools/scripts/run-examples.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file
