Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let have a different INSTALL_DIR and PROGRAM_DIR #2159

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions core/src/com/biglybt/platform/unix/startupScript
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
AUTOUPDATE_SCRIPT=1 # change to 0 if you don't want your changes overwritten on next SCRIPT_VERSION change
JAVA_PROGRAM_DIR="" # use full path to java bin dir, ex. "/usr/java/j2sdk1.4.2/bin/"
#PROGRAM_DIR="/home/username/apps/biglybt" # use full path to BiglyBT bin dir
#USER_PLUGINS_DIR="$HOME/.biglybt"
JAVA_PROPS=""

#######################################
Expand Down Expand Up @@ -103,7 +104,7 @@ runJavaOutput()
RESULT=`$JAVABIN \
-cp "${CLASSPATH}" \
"-Djava.library.path=${PROGRAM_DIR}" \
"-Dazureus.install.path=${PROGRAM_DIR}" \
"-Dazureus.install.path=${USER_PLUGINS_DIR}" \
"-Dazureus.script=$0" \
"-Dawt.useSystemAAFontSettings=gasp" \
${JAVA_PROPS} \
Expand Down Expand Up @@ -190,6 +191,11 @@ elif [ ! -f "${PROGRAM_DIR}/BiglyBT.jar" ]; then
exit 1
fi

# by default USER_PLUGINS_DIR is equal to PROGRAM DIR
if [ -z "$USER_PLUGINS_DIR" ]; then
USER_PLUGINS_DIR=${PROGRAM_DIR}
fi

OLDPATH=$PWD

# Change path here so we can do for loop on program dirs with spaces
Expand Down Expand Up @@ -229,7 +235,7 @@ echo "$MSG_LOADING"
$JAVABIN -Xmx256m \
-cp "${CLASSPATH}" \
"-Djava.library.path=${PROGRAM_DIR}" \
"-Dazureus.install.path=${PROGRAM_DIR}" \
"-Dazureus.install.path=${USER_PLUGINS_DIR}" \
"-Dazureus.script=$0" \
${JAVA_PROPS} \
${JAVA_ARGS} \
Expand Down