diff --git a/elements/hadoop-mapr/README.rst b/elements/hadoop-mapr/README.rst index 267a5129..a4ebd4e9 100644 --- a/elements/hadoop-mapr/README.rst +++ b/elements/hadoop-mapr/README.rst @@ -6,7 +6,7 @@ Creates images with local mirrors of MapR repositories: `core `_ and `ecosystem `_. Installs `OpenJDK `_ and -`Scala `_. +`Scala `_. In order to create the MapR images with ``diskimage-create.sh``, use the following syntax to select the ``MapR`` plugin: diff --git a/elements/hadoop-mapr/install.d/41-scala b/elements/hadoop-mapr/install.d/41-scala index c1454e6a..1ddd0355 100755 --- a/elements/hadoop-mapr/install.d/41-scala +++ b/elements/hadoop-mapr/install.d/41-scala @@ -11,10 +11,10 @@ echo "START: installing Scala" #Current available version DEF_VERSION="2.11.6" -RETURN_CODE="$(curl -s -o /dev/null -w "%{http_code}" http://www.scala-lang.org/)" +RETURN_CODE="$(curl -s -L -o /dev/null -w "%{http_code}" https://www.scala-lang.org/)" if [ "$RETURN_CODE" != "200" ]; then - echo "http://www.scala-lang.org is unreachable" && exit 1 + echo "https://www.scala-lang.org is unreachable" && exit 1 fi if [ -n "${SCALA_VERSION:-}" ]; then @@ -23,7 +23,7 @@ elif [ "trusty" == "${DIB_RELEASE:-}" ]; then # scale >= 2.12 for ubuntu depends on openjdk-8, not available on trusty VERSION=${DEF_VERSION} else - VERSION="$(curl -s --fail http://www.scala-lang.org| tr -d '\n' | sed 's/^.*[^0-9]\+\([0-9\.\?]\+\)<.\+$/\1/')" + VERSION="$(curl -s -L --fail https://www.scala-lang.org| tr -d '\n' | sed 's/^.*[^0-9]\+\([0-9\.\?]\+\)<.\+$/\1/')" if [ $? != 0 -o -z "${VERSION}" ]; then echo "Installing default version $DEF_VERSION" @@ -33,7 +33,7 @@ fi PKG=scala-${VERSION} -URL="http://downloads.lightbend.com/scala/${VERSION}" +URL="https://downloads.lightbend.com/scala/${VERSION}" if [ "$DISTRO_NAME" = "ubuntu" ]; then wget -N ${URL}/${PKG}.deb