You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/06/05 09:28:37 UTC
svn commit: r663489 - in /mina/ftpserver/trunk/distribution/bin: ftpd.sh
ftpd_ui.sh
Author: ngn
Date: Thu Jun 5 00:28:37 2008
New Revision: 663489
URL: http://svn.apache.org/viewvc?rev=663489&view=rev
Log:
Fixing line endings
Modified:
mina/ftpserver/trunk/distribution/bin/ftpd.sh
mina/ftpserver/trunk/distribution/bin/ftpd_ui.sh
Modified: mina/ftpserver/trunk/distribution/bin/ftpd.sh
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/bin/ftpd.sh?rev=663489&r1=663488&r2=663489&view=diff
==============================================================================
--- mina/ftpserver/trunk/distribution/bin/ftpd.sh (original)
+++ mina/ftpserver/trunk/distribution/bin/ftpd.sh Thu Jun 5 00:28:37 2008
@@ -1,135 +1,135 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# OS specific support. $var _must_ be set to either true or false.
-#
-cygwin=false;
-darwin=false;
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
- Darwin*) darwin=true
- if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
- fi
- ;;
-esac
-
-#
-# Get the FTPD_HOME variable
-#
-if [ -z "$FTPD_HOME" ] ; then
- # use the location of this script to infer $FTPD_HOME
- whoami=`basename $0`
- whereami=`echo $0 | sed -e "s#^[^/]#\`pwd\`/&#"`
- whereami=`dirname $whereami`
-
- # Resolve any symlinks of the now absolute path, $whereami
- realpath_listing=`ls -l $whereami/$whoami`
- case "$realpath_listing" in
- *-\>\ /*)
- realpath=`echo $realpath_listing | sed -e "s#^.*-> ##"`
- ;;
- *-\>*)
- realpath=`echo $realpath_listing | sed -e "s#^.*-> #$whereami/#"`
- ;;
- *)
- realpath=$whereami/$whoami
- ;;
- esac
- FTPD_HOME=`dirname "$realpath"`/..
-fi
-
-#
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-#
-if $cygwin ; then
- [ -n "$FTPD_HOME" ] &&
- FTPD_HOME=`cygpath --unix "$FTPD_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-
-#
-# Get the Java command
-#
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD=`which java 2> /dev/null `
- if [ -z "$JAVACMD" ] ; then
- JAVACMD=java
- fi
- fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly."
- echo " We cannot execute $JAVACMD"
- exit 1
-fi
-
-
-#
-# Get the path separator
-#
-if [ "$cygwin" = "true" ] ; then
- S=';'
-else
- S=':'
-fi
-
-
-#
-# Build classpath
-#
-if [ "$cygwin" = "true" ] ; then
- FTPD_CLASSPATH=$CLASSPATH$S`cygpath -w $FTPD_HOME/common/classes`
-else
- FTPD_CLASSPATH=$CLASSPATH$S$FTPD_HOME/common/classes
-fi
-
-for i in $FTPD_HOME/common/lib/*.jar; do
- if [ "$cygwin" = "true" ] ; then
- LIB=`cygpath -w $i`
- else
- LIB=$i
- fi
-
- FTPD_CLASSPATH=$FTPD_CLASSPATH$S$LIB
-done
-
-
-#
-# Execute command
-#
-CURR_DIR=`pwd`
-cd $FTPD_HOME
-MAIN_CLASS=org.apache.ftpserver.commandline.CommandLine
-"$JAVACMD" -classpath "$FTPD_CLASSPATH" $MAIN_CLASS $@
-RESULT=$?
-cd $CURR_DIR
-exit $RESULT
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# OS specific support. $var _must_ be set to either true or false.
+#
+cygwin=false;
+darwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ fi
+ ;;
+esac
+
+#
+# Get the FTPD_HOME variable
+#
+if [ -z "$FTPD_HOME" ] ; then
+ # use the location of this script to infer $FTPD_HOME
+ whoami=`basename $0`
+ whereami=`echo $0 | sed -e "s#^[^/]#\`pwd\`/&#"`
+ whereami=`dirname $whereami`
+
+ # Resolve any symlinks of the now absolute path, $whereami
+ realpath_listing=`ls -l $whereami/$whoami`
+ case "$realpath_listing" in
+ *-\>\ /*)
+ realpath=`echo $realpath_listing | sed -e "s#^.*-> ##"`
+ ;;
+ *-\>*)
+ realpath=`echo $realpath_listing | sed -e "s#^.*-> #$whereami/#"`
+ ;;
+ *)
+ realpath=$whereami/$whoami
+ ;;
+ esac
+ FTPD_HOME=`dirname "$realpath"`/..
+fi
+
+#
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+#
+if $cygwin ; then
+ [ -n "$FTPD_HOME" ] &&
+ FTPD_HOME=`cygpath --unix "$FTPD_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+
+#
+# Get the Java command
+#
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java 2> /dev/null `
+ if [ -z "$JAVACMD" ] ; then
+ JAVACMD=java
+ fi
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+
+#
+# Get the path separator
+#
+if [ "$cygwin" = "true" ] ; then
+ S=';'
+else
+ S=':'
+fi
+
+
+#
+# Build classpath
+#
+if [ "$cygwin" = "true" ] ; then
+ FTPD_CLASSPATH=$CLASSPATH$S`cygpath -w $FTPD_HOME/common/classes`
+else
+ FTPD_CLASSPATH=$CLASSPATH$S$FTPD_HOME/common/classes
+fi
+
+for i in $FTPD_HOME/common/lib/*.jar; do
+ if [ "$cygwin" = "true" ] ; then
+ LIB=`cygpath -w $i`
+ else
+ LIB=$i
+ fi
+
+ FTPD_CLASSPATH=$FTPD_CLASSPATH$S$LIB
+done
+
+
+#
+# Execute command
+#
+CURR_DIR=`pwd`
+cd $FTPD_HOME
+MAIN_CLASS=org.apache.ftpserver.commandline.CommandLine
+"$JAVACMD" -classpath "$FTPD_CLASSPATH" $MAIN_CLASS $@
+RESULT=$?
+cd $CURR_DIR
+exit $RESULT
Modified: mina/ftpserver/trunk/distribution/bin/ftpd_ui.sh
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/bin/ftpd_ui.sh?rev=663489&r1=663488&r2=663489&view=diff
==============================================================================
--- mina/ftpserver/trunk/distribution/bin/ftpd_ui.sh (original)
+++ mina/ftpserver/trunk/distribution/bin/ftpd_ui.sh Thu Jun 5 00:28:37 2008
@@ -1,136 +1,136 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# OS specific support. $var _must_ be set to either true or false.
-#
-cygwin=false;
-darwin=false;
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
- Darwin*) darwin=true
- if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
- fi
- ;;
-esac
-
-#
-# Get the FTPD_HOME variable
-#
-if [ -z "$FTPD_HOME" ] ; then
- # use the location of this script to infer $FTPD_HOME
- whoami=`basename $0`
- whereami=`echo $0 | sed -e "s#^[^/]#\`pwd\`/&#"`
- whereami=`dirname $whereami`
-
- # Resolve any symlinks of the now absolute path, $whereami
- realpath_listing=`ls -l $whereami/$whoami`
- case "$realpath_listing" in
- *-\>\ /*)
- realpath=`echo $realpath_listing | sed -e "s#^.*-> ##"`
- ;;
- *-\>*)
- realpath=`echo $realpath_listing | sed -e "s#^.*-> #$whereami/#"`
- ;;
- *)
- realpath=$whereami/$whoami
- ;;
- esac
- FTPD_HOME=`dirname "$realpath"`/..
-fi
-
-
-#
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-#
-if $cygwin ; then
- [ -n "$FTPD_HOME" ] &&
- FTPD_HOME=`cygpath --unix "$FTPD_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-
-#
-# Get the Java command
-#
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD=`which java 2> /dev/null `
- if [ -z "$JAVACMD" ] ; then
- JAVACMD=java
- fi
- fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly."
- echo " We cannot execute $JAVACMD"
- exit 1
-fi
-
-
-#
-# Get the path separator
-#
-if [ "$cygwin" = "true" ] ; then
- S=';'
-else
- S=':'
-fi
-
-
-#
-# Build classpath
-#
-if [ "$cygwin" = "true" ] ; then
- FTPD_CLASSPATH=$CLASSPATH$S`cygpath -w $FTPD_HOME/common/classes`$S`cygpath -w $FTPD_HOME/target/classes`
-else
- FTPD_CLASSPATH=$CLASSPATH$S$FTPD_HOME/common/classes$S$FTPD_HOME/target/classes
-fi
-
-for i in $FTPD_HOME/common/lib/*.jar; do
- if [ "$cygwin" = "true" ] ; then
- LIB=`cygpath -w $i`
- else
- LIB=$i
- fi
-
- FTPD_CLASSPATH=$FTPD_CLASSPATH$S$LIB
-done
-
-
-#
-# Execute command
-#
-CURR_DIR=`pwd`
-cd $FTPD_HOME
-MAIN_CLASS=org.apache.ftpserver.gui.ServerFrame
-"$JAVACMD" -classpath "$FTPD_CLASSPATH" $MAIN_CLASS $@
-RESULT=$?
-cd $CURR_DIR
-exit $RESULT
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# OS specific support. $var _must_ be set to either true or false.
+#
+cygwin=false;
+darwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ fi
+ ;;
+esac
+
+#
+# Get the FTPD_HOME variable
+#
+if [ -z "$FTPD_HOME" ] ; then
+ # use the location of this script to infer $FTPD_HOME
+ whoami=`basename $0`
+ whereami=`echo $0 | sed -e "s#^[^/]#\`pwd\`/&#"`
+ whereami=`dirname $whereami`
+
+ # Resolve any symlinks of the now absolute path, $whereami
+ realpath_listing=`ls -l $whereami/$whoami`
+ case "$realpath_listing" in
+ *-\>\ /*)
+ realpath=`echo $realpath_listing | sed -e "s#^.*-> ##"`
+ ;;
+ *-\>*)
+ realpath=`echo $realpath_listing | sed -e "s#^.*-> #$whereami/#"`
+ ;;
+ *)
+ realpath=$whereami/$whoami
+ ;;
+ esac
+ FTPD_HOME=`dirname "$realpath"`/..
+fi
+
+
+#
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+#
+if $cygwin ; then
+ [ -n "$FTPD_HOME" ] &&
+ FTPD_HOME=`cygpath --unix "$FTPD_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+
+#
+# Get the Java command
+#
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java 2> /dev/null `
+ if [ -z "$JAVACMD" ] ; then
+ JAVACMD=java
+ fi
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+
+#
+# Get the path separator
+#
+if [ "$cygwin" = "true" ] ; then
+ S=';'
+else
+ S=':'
+fi
+
+
+#
+# Build classpath
+#
+if [ "$cygwin" = "true" ] ; then
+ FTPD_CLASSPATH=$CLASSPATH$S`cygpath -w $FTPD_HOME/common/classes`$S`cygpath -w $FTPD_HOME/target/classes`
+else
+ FTPD_CLASSPATH=$CLASSPATH$S$FTPD_HOME/common/classes$S$FTPD_HOME/target/classes
+fi
+
+for i in $FTPD_HOME/common/lib/*.jar; do
+ if [ "$cygwin" = "true" ] ; then
+ LIB=`cygpath -w $i`
+ else
+ LIB=$i
+ fi
+
+ FTPD_CLASSPATH=$FTPD_CLASSPATH$S$LIB
+done
+
+
+#
+# Execute command
+#
+CURR_DIR=`pwd`
+cd $FTPD_HOME
+MAIN_CLASS=org.apache.ftpserver.gui.ServerFrame
+"$JAVACMD" -classpath "$FTPD_CLASSPATH" $MAIN_CLASS $@
+RESULT=$?
+cd $CURR_DIR
+exit $RESULT