diff --git a/iSSH2-libssh2.sh b/iSSH2-libssh2.sh index b180f85..a6d95ce 100755 --- a/iSSH2-libssh2.sh +++ b/iSSH2-libssh2.sh @@ -27,19 +27,24 @@ set -e mkdir -p "${LIBSSHDIR}" -if [ ! -f "${LIBSSHDIR}/libssh2-${LIBSSH_VERSION}.tar.gz" ]; +LIBSSH_TAR="libssh2-${LIBSSH_VERSION}.tar.gz" + +if [ ! -f "${LIBSSHDIR}/${LIBSSH_TAR}" ]; then - echo "Downloading libssh2-${LIBSSH_VERSION}.tar.gz" - curl --progress-bar "http://www.libssh2.org/download/libssh2-${LIBSSH_VERSION}.tar.gz" > "${LIBSSHDIR}/libssh2-${LIBSSH_VERSION}.tar.gz" + echo "Downloading ${LIBSSH_TAR}" + curl --progress-bar "http://www.libssh2.org/download/${LIBSSH_TAR}" > "${LIBSSHDIR}/${LIBSSH_TAR}" else - echo "libssh2-${LIBSSH_VERSION}.tar.gz already exists" + echo "${LIBSSH_TAR} already exists" fi +LIBSSH_MD5=`md5 -q ${LIBSSHDIR}/${LIBSSH_TAR}` +echo "MD5: ${LIBSSH_MD5}" + mkdir -p "${LIBSSHDIR}/src/" set +e -echo "Extracting libssh2-${LIBSSH_VERSION}.tar.gz" -tar -zxkf "${LIBSSHDIR}/libssh2-${LIBSSH_VERSION}.tar.gz" -C "${LIBSSHDIR}/src" --strip-components 1 2>&- +echo "Extracting ${LIBSSH_TAR}" +tar -zxkf "${LIBSSHDIR}/${LIBSSH_TAR}" -C "${LIBSSHDIR}/src" --strip-components 1 2>&- set -e echo "Building Libssh2 ${LIBSSH_VERSION}:" diff --git a/iSSH2-openssl.sh b/iSSH2-openssl.sh index 2cc6cc4..32b461a 100755 --- a/iSSH2-openssl.sh +++ b/iSSH2-openssl.sh @@ -27,19 +27,24 @@ set -e mkdir -p "${LIBSSLDIR}" -if [ ! -f "${LIBSSLDIR}/openssl-${LIBSSL_VERSION}.tar.gz" ]; +LIBSSL_TAR="openssl-${LIBSSL_VERSION}.tar.gz" + +if [ ! -f "${LIBSSLDIR}/${LIBSSL_TAR}" ]; then - echo "Downloading openssl-${LIBSSL_VERSION}.tar.gz" - curl --progress-bar "http://www.openssl.org/source/openssl-${LIBSSL_VERSION}.tar.gz" > "${LIBSSLDIR}/openssl-${LIBSSL_VERSION}.tar.gz" + echo "Downloading ${LIBSSL_TAR}" + curl --progress-bar "http://www.openssl.org/source/${LIBSSL_TAR}" > "${LIBSSLDIR}/${LIBSSL_TAR}" else - echo "openssl-${LIBSSL_VERSION}.tar.gz already exists" + echo "${LIBSSL_TAR} already exists" fi +LIBSSL_MD5=`md5 -q ${LIBSSLDIR}/${LIBSSL_TAR}` +echo "MD5: ${LIBSSL_MD5}" + mkdir -p "${LIBSSLDIR}/src/" set +e -echo "Extracting openssl-${LIBSSL_VERSION}.tar.gz" -tar -zxkf "${LIBSSLDIR}/openssl-${LIBSSL_VERSION}.tar.gz" -C "${LIBSSLDIR}/src" --strip-components 1 2>&- +echo "Extracting ${LIBSSL_TAR}" +tar -zxkf "${LIBSSLDIR}/${LIBSSL_TAR}" -C "${LIBSSLDIR}/src" --strip-components 1 2>&- set -e echo "Building OpenSSL ${LIBSSL_VERSION}:"