From: Sébastien Han <seb@redhat.com>
Date: Mon, 15 May 2017 08:56:33 +0000 (+0200)
Subject: generate_group_vars_sample: do not use expr
X-Git-Tag: v2.2.5^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5a61cf97ebdee43cdaafe282df48dec3a9488f3;p=ceph-ansible.git

generate_group_vars_sample: do not use expr

As mentionned in https://github.com/koalaman/shellcheck/wiki/SC2003
expr is antiquated.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 53be0980be65170bb4f2acb3c87b0c1eff8c7acb)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/generate_group_vars_sample.sh b/generate_group_vars_sample.sh
index c238d8cda..e42253858 100755
--- a/generate_group_vars_sample.sh
+++ b/generate_group_vars_sample.sh
@@ -36,7 +36,7 @@ EOF
     sed '/^---/d; s/^\([A-Za-z[:space:]]\)/#\1/' \
       "$defaults" >> "$basedir"/group_vars/"$output"
     echo >> "$basedir"/group_vars/"$output"
-  elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+  elif [ "$(uname -s)" == "Linux" ]; then
     sed '/^---/d; s/^\([A-Za-z[:space:]].\+\)/#\1/' \
       "$defaults" >> "$basedir"/group_vars/"$output"
     echo >> "$basedir"/group_vars/"$output"