jan-leila/Slipstream-Mod-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Continuation of commit a999e1e

Browse source
This commit is contained in:
Vhati 2018-01-01 02:26:14 -05:00
parent a999e1e804
commit 915ad7863b
2 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
skel_unix/modman-cli.sh
View file

@ -9,12 +9,26 @@ fi
cd "${maindir}"; cd "${maindir}";
# Search in $PATH among other places.
java_cmd=$(command -v java); java_cmd=$(command -v java);
# OSX uses a command to decide java's location. # OSX uses a command to decide java's location.
if [ -x "/usr/libexec/java_home" ]; then if [ -x "/usr/libexec/java_home" ]; then
export JAVA_HOME=`/usr/libexec/java_home` export JAVA_HOME=$(/usr/libexec/java_home)
java_cmd=${JAVA_HOME}/bin/java
if [ -n "${JAVA_HOME}" ]; then
java_cmd=${JAVA_HOME}/bin/java
fi
fi fi
${java_cmd} -jar modman.jar "$@"; if [ -n "${java_cmd}" ]; then
"${java_cmd}" -jar modman.jar "$@";
else
echo "";
echo "This script was unable to find java."
echo "";
fi

29
skel_unix/modman.command
View file

@ -47,19 +47,34 @@ fi
cd "${maindir}"; cd "${maindir}";
# - - - # - - -
# Search in $PATH among other places.
java_cmd=$(command -v java); java_cmd=$(command -v java);
# OSX uses a command to decide java's location. # OSX uses a command to decide java's location (or prompt the user to install it).
if [ -x "/usr/libexec/java_home" ]; then if [ -x "/usr/libexec/java_home" ]; then
export JAVA_HOME=`/usr/libexec/java_home` export JAVA_HOME=$(/usr/libexec/java_home --request)
java_cmd=${JAVA_HOME}/bin/java
if [ -n "${JAVA_HOME}" ]; then
java_cmd=${JAVA_HOME}/bin/java
fi
fi fi
echo ""; if [ -n "${java_cmd}" ]; then
echo "Found java at: ${java_cmd}";
echo ""; echo "";
echo "Found java at: ${java_cmd}";
echo "";
"${java_cmd}" -jar modman.jar;
else
echo "";
echo "This script was unable to find java."
echo "";
fi
${java_cmd} -jar modman.jar;
# - - - # - - -
if [ "${ingui}" = "1" ]; then if [ "${ingui}" = "1" ]; then