mirror/sdkman-cli
1
0
Fork 0
mirror of https://github.com/sdkman/sdkman-cli.git synced 2026-01-31 09:43:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move download function to installation script.

Browse Source
This commit is contained in:
Marco Vermeulen
2013-07-12 18:27:34 +01:00
parent b80d07ff93
commit bc7dbac7bd
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/bash/gvm-common.sh
View File

@@ -95,26 +95,6 @@ function __gvmtool_determine_current_version {
fi
}
function __gvmtool_download {
CANDIDATE="$1"
VERSION="$2"
mkdir -p "${GVM_DIR}/archives"
if [ ! -f "${GVM_DIR}/archives/${CANDIDATE}-${VERSION}.zip" ]; then
echo ""
echo "Downloading: ${CANDIDATE} ${VERSION}"
echo ""
DOWNLOAD_URL="${GVM_SERVICE}/download/${CANDIDATE}/${VERSION}?platform=${GVM_PLATFORM}"
ZIP_ARCHIVE="${GVM_DIR}/archives/${CANDIDATE}-${VERSION}.zip"
curl -L "${DOWNLOAD_URL}" > "${ZIP_ARCHIVE}"
__gvmtool_validate_zip "${ZIP_ARCHIVE}" || return 1
else
echo ""
echo "Found a previously downloaded ${CANDIDATE} ${VERSION} archive. Not downloading it again..."
__gvmtool_validate_zip "${GVM_DIR}/archives/${CANDIDATE}-${VERSION}.zip" || return 1
fi
echo ""
}
function __gvmtool_validate_zip {
ZIP_ARCHIVE="$1"
ZIP_OK=$(unzip -t "${ZIP_ARCHIVE}" | grep 'No errors detected in compressed data')

20
src/main/bash/gvm-install.sh
View File

@@ -16,6 +16,26 @@
# limitations under the License.
#
function __gvmtool_download {
CANDIDATE="$1"
VERSION="$2"
mkdir -p "${GVM_DIR}/archives"
if [ ! -f "${GVM_DIR}/archives/${CANDIDATE}-${VERSION}.zip" ]; then
echo ""
echo "Downloading: ${CANDIDATE} ${VERSION}"
echo ""
DOWNLOAD_URL="${GVM_SERVICE}/download/${CANDIDATE}/${VERSION}?platform=${GVM_PLATFORM}"
ZIP_ARCHIVE="${GVM_DIR}/archives/${CANDIDATE}-${VERSION}.zip"
curl -L "${DOWNLOAD_URL}" > "${ZIP_ARCHIVE}"
__gvmtool_validate_zip "${ZIP_ARCHIVE}" || return 1
else
echo ""
echo "Found a previously downloaded ${CANDIDATE} ${VERSION} archive. Not downloading it again..."
__gvmtool_validate_zip "${GVM_DIR}/archives/${CANDIDATE}-${VERSION}.zip" || return 1
fi
echo ""
}
function __gvmtool_install {
CANDIDATE="$1"
LOCAL_FOLDER="$3"