From b8bb0aa0cc28c273724481b74a18d2f1c6222556 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 21 Jun 2014 19:13:43 +0100 Subject: [PATCH] Fix SC2086 - Double quote to prevent globing and word splitting --- bootstrap-salt.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b5548c5..5c435ec 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -578,14 +578,14 @@ __gather_os_info __parse_version_string() { VERSION_STRING="$1" PARSED_VERSION=$( - echo $VERSION_STRING | + echo "$VERSION_STRING" | sed -e 's/^/#/' \ -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\)\(\.[0-9][0-9]*\).*$/\1/' \ -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \ -e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \ -e 's/^#.*$//' ) - echo $PARSED_VERSION + echo "$PARSED_VERSION" } @@ -917,10 +917,10 @@ __ubuntu_derivatives_translation() { if [ "x${match}" != "x" ]; then case $match in "elementary_os") - _major="$(echo $DISTRO_VERSION | sed 's/\.//g')" + _major=$(echo "$DISTRO_VERSION" | sed 's/\.//g') ;; *) - _major="$(echo $DISTRO_VERSION | sed 's/^\([0-9]*\).*/\1/g')" + _major=$(echo "$DISTRO_VERSION" | sed 's/^\([0-9]*\).*/\1/g') ;; esac