Fixed some sort of strange line ending bug.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@602 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
#!/bin/sh -v
|
||||
#
|
||||
# /usr/bin/rdjbrowse
|
||||
#
|
||||
@@ -13,20 +13,21 @@ LOGFILE=/var/log/$NAME/stdout.log
|
||||
ROBODJ_HOME=/usr/share/$NAME
|
||||
|
||||
# The following varibales can we overwritten in /etc/default/robodj
|
||||
|
||||
MUSICD_HOST=localhost
|
||||
MUSICD_PORT=2500
|
||||
# The first existing directory is used for JAVA_HOME
|
||||
JDK_DIRS="/usr/local/jdk1.4 /usr/lib/j2se/1.3"
|
||||
JDK_DIRS="/usr/local/jdk1.4 /usr/local/jdk1.3 /usr/lib/j2se/1.3"
|
||||
|
||||
# overwrite settings from default file
|
||||
if [ -f /etc/default/robodj ]; then
|
||||
. /etc/default/rododj
|
||||
. /etc/default/robodj
|
||||
fi
|
||||
|
||||
# Look for the right JVM to
|
||||
for jdir in $JDK_DIRS; do
|
||||
if [ -d "$jdir" -a -z "${JAVA_HOME}" ]; then
|
||||
JAVA_HOME=$jdir
|
||||
fi
|
||||
if [ -d "$jdir" -a -z "${JAVA_HOME}" ]; then
|
||||
JAVA_HOME=$jdir
|
||||
fi
|
||||
done
|
||||
JAVA="$JAVA_HOME/bin/java"
|
||||
|
||||
@@ -37,10 +38,10 @@ CLASSPATH="$JAVA_HOME/jre/lib/rt.jar"
|
||||
|
||||
# Add all JAR files in /usr/share/robodj/lib to the CLASSPATH
|
||||
for jar in $ROBODJ_HOME/lib/*.jar; do
|
||||
if [ -e $jar ]; then
|
||||
CLASSPATH=$jar:$CLASSPATH
|
||||
fi
|
||||
if [ -e $jar ]; then
|
||||
CLASSPATH=$jar:$CLASSPATH
|
||||
fi
|
||||
done
|
||||
export CLASSPATH
|
||||
|
||||
$JAVA $CLASS
|
||||
$JAVA -Dmusicd_host=$MUSICD_HOST -Dmusicd_port=$MUSICD_PORT $CLASS
|
||||
|
||||
Reference in New Issue
Block a user