From: XhmikosR <redacted>
Date: Sun, 23 Feb 2020 07:45:44 +0000 (+0200)
Subject: Minor shell script tweaks
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=59ce889ff051c8936019f3ff9d5b428f3f7c5189;p=stevenblack-hosts.git

Minor shell script tweaks

* always double quote variables
* use https for the miniconda URLs
---

diff --git a/ci/install_conda.sh b/ci/install_conda.sh
index 22bb3dfba..f3f45b303 100755
--- a/ci/install_conda.sh
+++ b/ci/install_conda.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
 if [ -d "$HOME/miniconda3" ] && [ -e "$HOME/miniconda3/bin/conda" ]; then
-    echo "Miniconda install already present from cache: $HOME/miniconda3"
-    rm -rf $HOME/miniconda3/envs/hosts  # Just in case...
+    echo "Miniconda install already present in cache: $HOME/miniconda3"
+    rm -rf "$HOME"/miniconda3/envs/hosts  # Just in case...
 else
     echo "Installing Miniconda..."
-    rm -rf $HOME/miniconda3  # Just in case...
+    rm -rf "$HOME"/miniconda3  # Just in case...
 
     if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
-        wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
+        wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
     else
-        wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
+        wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
     fi
 
     bash miniconda.sh -b -p "$HOME/miniconda3" || exit 1
diff --git a/ci/setup_conda_env.sh b/ci/setup_conda_env.sh
index 69fd834df..467066518 100755
--- a/ci/setup_conda_env.sh
+++ b/ci/setup_conda_env.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "Creating a Python $PYTHON_VERSION environment"
-conda create -n hosts python=$PYTHON_VERSION || exit 1
+conda create -n hosts python="$PYTHON_VERSION" || exit 1
 source activate hosts
 
 echo "Installing packages..."