From 3f8a610f4e2906eccf701fcd13d77ca01e99d2ee Mon Sep 17 00:00:00 2001
From: Mojca Miklavec <mojca@macports.org>
Date: Wed, 10 Aug 2016 21:14:16 +0000
Subject: [PATCH] mp-buildbot: proper quoting, typos, style improvements

git-svn-id: https://svn.macports.org/repository/macports/contrib/mp-buildbot@151223 d073be05-634f-4543-b044-5fe20cf6d1d6
---
 mpbb-install-dependencies | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/mpbb-install-dependencies b/mpbb-install-dependencies
index cbb24b2..4f8e51a 100644
--- a/mpbb-install-dependencies
+++ b/mpbb-install-dependencies
@@ -20,13 +20,10 @@ install-dependencies() {
         return 1
     fi
 
-    # prepare the log file
-    if ! [[ -d "${option_logdir}" ]] ; then
-        mkdir -p "${option_logdir}"
-    fi
-    log_status_dependencies=${option_logdir}/dependencies-progress.txt
-    # make ure to start with an empty file
-    echo -n "" > $log_status_dependencies
+    # prepare the log file and make sure to start with an empty one
+    mkdir -p "${option_logdir}"
+    log_status_dependencies="${option_logdir}/dependencies-progress.txt"
+    > "$log_status_dependencies"
 
     # calculate list of dependencies in-order
     dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "${option_port}")
@@ -44,10 +41,10 @@ install-dependencies() {
     dependencies_counter=1
 
     echo "Installing $dependencies_count dependencies:"
-    echo "Installing $dependencies_count dependencies:" >> $log_status_dependencies
+    echo "Installing $dependencies_count dependencies:" >> "$log_status_dependencies"
     echo "$dependencies" | sed -E 's/^/ - /'
-    echo "$dependencies" | sed -E 's/^/ - /' >> $log_status_dependencies
-    echo "" >> $log_status_dependencies
+    echo "$dependencies" | sed -E 's/^/ - /' >> "$log_status_dependencies"
+    echo >> "$log_status_dependencies"
 
     echo "$dependencies" | while read dependency; do
         # Split portname +variant1+variant2 into portname and variants, where
@@ -55,15 +52,15 @@ install-dependencies() {
         depname=${dependency%% *}
         depvariants=${dependency:${#depname}+1}
 
-        text="Installing dependency ($dependencies_counter of $dependencies_count) '${depname}', variants: '${depvariants}'"
+        text="Installing dependency ($dependencies_counter of $dependencies_count) '${depname}' with variants '${depvariants}'"
         echo "----> ${text}"
-        echo -n "${text}' ... " >> $log_status_dependencies
+        echo -n "${text} ... " >> "$log_status_dependencies"
         if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants; then
             echo "Build of dependency '${depname}' failed, aborting." >&2
-            echo " [FAIL]" >> $log_status_dependencies
+            echo " [FAIL]" >> "$log_status_dependencies"
             return 1
         else
-            echo " [OK]" >> $log_status_dependencies
+            echo " [OK]" >> "$log_status_dependencies"
             dependencies_counter=$((dependencies_counter + 1))
         fi
     done