declare necessary variables before sourcing sub-modules

This commit is contained in:
Masato Nagai
2013-05-05 17:56:35 +09:00
parent 2bbb30036e
commit c6fd31edec

View File

@@ -36,11 +36,6 @@ function gvm_source_modules {
unset f
}
if [[ "${GVM_INIT}" == "true" ]]; then
gvm_source_modules
return
fi
# OS specific support (must be 'true' or 'false').
cygwin=false;
darwin=false;
@@ -60,6 +55,32 @@ case "$(uname)" in
freebsd=true
esac
OFFLINE_BROADCAST=$( cat << EOF
==== BROADCAST =============================================
AEROPLANE MODE ENABLED! Some functionality is now disabled.
============================================================
EOF
)
ONLINE_BROADCAST=$( cat << EOF
==== BROADCAST =============================================
ONLINE MODE RE-ENABLED! All functionality now restored.
============================================================
EOF
)
OFFLINE_MESSAGE="This command is not available in aeroplane mode."
GVM_CANDIDATES=("groovy" "grails" "griffon" "gradle" "lazybones" "vertx")
if [[ "${GVM_INIT}" == "true" ]]; then
gvm_source_modules
return
fi
# Attempt to set JAVA_HOME if it's not already set.
if [ -z "${JAVA_HOME}" ] ; then
if ${darwin} ; then
@@ -97,27 +118,6 @@ if [ -z "${GVM_DIR}" ]; then
export GVM_DIR="$HOME/.gvm"
fi
OFFLINE_BROADCAST=$( cat << EOF
==== BROADCAST =============================================
AEROPLANE MODE ENABLED! Some functionality is now disabled.
============================================================
EOF
)
ONLINE_BROADCAST=$( cat << EOF
==== BROADCAST =============================================
ONLINE MODE RE-ENABLED! All functionality now restored.
============================================================
EOF
)
OFFLINE_MESSAGE="This command is not available in aeroplane mode."
GVM_CANDIDATES=("groovy" "grails" "griffon" "gradle" "lazybones" "vertx")
PATH="${GVM_DIR}/bin:${GVM_DIR}/ext:$PATH"
GROOVY_HOME="${GVM_DIR}/groovy/current"