diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2017-05-05 18:41:09 -0400 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2017-07-14 06:58:26 +0200 |
| commit | 196cdd7ae6626e8c66336b6121c9024b70acea9c (patch) | |
| tree | 0cb8d448be851f21f8a197231f63e6d12240d3f8 /lib | |
| parent | c440e6f1c531688668ae25924f85cc45980f8295 (diff) | |
| download | devtools32-196cdd7ae6626e8c66336b6121c9024b70acea9c.tar.xz | |
Make slightly more involved changes to make shellcheck happy.
- Use `read -r` instead of other forms of read or looping
- Use arrays instead of strings with whitespaces.
- In one instance, use ${var%%.*} instead of $(echo $var|cut -f. -d1)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/common.sh b/lib/common.sh index 4a15d9a..ad6194d 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -123,24 +123,27 @@ in_array() { ## get_full_version() { # set defaults if they weren't specified in buildfile - pkgbase=${pkgbase:-${pkgname[0]}} - epoch=${epoch:-0} + local pkgbase=${pkgbase:-${pkgname[0]}} + local epoch=${epoch:-0} + local pkgver=${pkgver} + local pkgrel=${pkgrel} if [[ -z $1 ]]; then if (( ! epoch )); then - echo $pkgver-$pkgrel + printf '%s\n' "$pkgver-$pkgrel" else - echo $epoch:$pkgver-$pkgrel + printf '%s\n' "$epoch:$pkgver-$pkgrel" fi else + local pkgver_override='' pkgrel_override='' epoch_override='' for i in pkgver pkgrel epoch; do local indirect="${i}_override" eval "$(declare -f "package_$1" | sed -n "s/\(^[[:space:]]*$i=\)/${i}_override=/p")" [[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\" done if (( ! epoch_override )); then - echo $pkgver_override-$pkgrel_override + printf '%s\n' "$pkgver_override-$pkgrel_override" else - echo $epoch_override:$pkgver_override-$pkgrel_override + printf '%s\n' "$epoch_override:$pkgver_override-$pkgrel_override" fi fi } |