github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-05 04:00:54 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-1264. Sqoop2: Remove unnecessary cd command calls from sqoop.sh

Browse Source 
(Jarek Jarcec Cecho via Hari Shreedharan)
This commit is contained in:
Hari Shreedharan 2014-01-02 09:17:17 -08:00
parent 39e26f2605
commit ad93e2a5e8
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/src/main/bin/sqoop.sh vendored
View File

@ -29,8 +29,6 @@ if [ $# = 0 ]; then
exit exit
fi fi
OLD_DIR=`pwd`
# resolve links - $0 may be a softlink # resolve links - $0 may be a softlink
PRG="${0}" PRG="${0}"
@ -47,11 +45,10 @@ done
BASEDIR=`dirname ${PRG}` BASEDIR=`dirname ${PRG}`
BASEDIR=`cd ${BASEDIR}/..;pwd` BASEDIR=`cd ${BASEDIR}/..;pwd`
cd ${BASEDIR}
echo "Sqoop home directory: ${BASEDIR}" echo "Sqoop home directory: ${BASEDIR}"
CATALINA_BIN=${CATALINA_BIN:-server/bin} CATALINA_BIN=${CATALINA_BIN:-${BASEDIR}/server/bin}
CLIENT_LIB=${CLIENT_LIB:-shell/lib} CLIENT_LIB=${CLIENT_LIB:-${BASEDIR}/shell/lib}
setup_catalina_opts() { setup_catalina_opts() {
# The Java System properties 'sqoop.http.port' and 'sqoop.admin.port' are # The Java System properties 'sqoop.http.port' and 'sqoop.admin.port' are
@ -110,13 +107,9 @@ case $COMMAND in
client) client)
# Build class path with full path to each library # Build class path with full path to each library
for f in $CLIENT_LIB/*.jar; do for f in $CLIENT_LIB/*.jar; do
CLASSPATH="${CLASSPATH}:${BASEDIR}/$f" CLASSPATH="${CLASSPATH}:$f"
done done
# We need to change current directory back to original as optional user side script
# might be specified with relative path.
cd ${OLD_DIR}
EXEC_JAVA='java' EXEC_JAVA='java'
if [ -n "${JAVA_HOME}" ] ; then if [ -n "${JAVA_HOME}" ] ; then
EXEC_JAVA="${JAVA_HOME}/bin/java" EXEC_JAVA="${JAVA_HOME}/bin/java"
@ -128,5 +121,3 @@ case $COMMAND in
echo "Command is not recognized." echo "Command is not recognized."
;; ;;
esac esac
cd ${OLD_DIR}