Author: suresh Date: Tue Mar 5 00:14:05 2013 New Revision: 1452607 URL: http://svn.apache.org/r1452607 Log: HADOOP-9356. Remove remaining references to cygwin/cygpath from scripts. Contributed by Chris Nauroth.
Modified: hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/bin/yarn hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/pom.xml Modified: hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/bin/yarn URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/bin/yarn?rev=1452607&r1=1452606&r2=1452607&view=diff ============================================================================== --- hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/bin/yarn (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/hadoop-yarn/bin/yarn Tue Mar 5 00:14:05 2013 @@ -72,11 +72,6 @@ function print_usage(){ echo "Most commands print help when invoked w/o parameters." } -cygwin=false -case "`uname`" in -CYGWIN*) cygwin=true;; -esac - # if no args specified, show usage if [ $# = 0 ]; then print_usage @@ -177,9 +172,6 @@ unset IFS # figure out which class to run if [ "$COMMAND" = "classpath" ] ; then - if $cygwin; then - CLASSPATH=`cygpath -p -w "$CLASSPATH"` - fi echo $CLASSPATH exit elif [ "$COMMAND" = "rmadmin" ] ; then @@ -227,19 +219,6 @@ else CLASS=$COMMAND fi -# cygwin path translation -if $cygwin; then - CLASSPATH=`cygpath -p -w "$CLASSPATH"` - HADOOP_YARN_HOME=`cygpath -w "$HADOOP_YARN_HOME"` - YARN_LOG_DIR=`cygpath -w "$YARN_LOG_DIR"` - TOOL_PATH=`cygpath -p -w "$TOOL_PATH"` -fi - -# cygwin path translation -if $cygwin; then - JAVA_LIBRARY_PATH=`cygpath -p "$JAVA_LIBRARY_PATH"` -fi - YARN_OPTS="$YARN_OPTS -Dhadoop.log.dir=$YARN_LOG_DIR" YARN_OPTS="$YARN_OPTS -Dyarn.log.dir=$YARN_LOG_DIR" YARN_OPTS="$YARN_OPTS -Dhadoop.log.file=$YARN_LOGFILE" Modified: hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/pom.xml?rev=1452607&r1=1452606&r2=1452607&view=diff ============================================================================== --- hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/pom.xml (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-yarn-project/pom.xml Tue Mar 5 00:14:05 2013 @@ -180,14 +180,7 @@ <target if="tar"> <!-- Using Unix script to preserve symlinks --> <echo file="${project.build.directory}/dist-maketar.sh"> - - which cygpath 2> /dev/null - if [ $? != 0 ]; then - BUILD_DIR="${project.build.directory}" - else - BUILD_DIR=`cygpath --unix '${project.build.directory}'` - fi - cd $BUILD_DIR + cd "${project.build.directory}" tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz </echo> <exec executable="sh" dir="${project.build.directory}" failonerror="true">