Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/locale-gen:master commit in: /
Date: Mon, 27 Sep 2021 06:49:15
Message-Id: 1632724659.088812be4e5e61bb614d90df14dc7a7117b38d51.vapier@gentoo
1 commit: 088812be4e5e61bb614d90df14dc7a7117b38d51
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 27 06:37:39 2021 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 27 06:37:39 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=088812be
7
8 add quotes around : ${...} defaults
9
10 In practice this shouldn't matter, but this makes shellcheck a bit
11 happy in case of pathological globs in environment variables.
12
13 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
14
15 locale-gen | 10 +++++-----
16 1 file changed, 5 insertions(+), 5 deletions(-)
17
18 diff --git a/locale-gen b/locale-gen
19 index 4eb75d0..03caff2 100755
20 --- a/locale-gen
21 +++ b/locale-gen
22 @@ -105,14 +105,14 @@ fi
23
24 if [[ -z ${JOBS_MAX} ]] ; then
25 JOBS_MAX=$(getconf _NPROCESSORS_ONLN 2>/dev/null)
26 - : ${JOBS_MAX:=1}
27 + : "${JOBS_MAX:=1}"
28 fi
29 [[ ${JOBS_MAX} -lt 1 ]] && JOBS_MAX=1
30 [[ -n ${SET_X} ]] && set -x
31 -: ${KEEP:=${JUST_LIST}}
32 +: "${KEEP:=${JUST_LIST}}"
33 [[ -n ${GENERATE} ]] && UPDATE="true" && KEEP="true"
34
35 -: ${ROOT:=/}
36 +: "${ROOT:=/}"
37 ROOT="${ROOT%/}/"
38
39 if [[ ${ROOT} != "/" ]] ; then
40 @@ -120,7 +120,7 @@ if [[ ${ROOT} != "/" ]] ; then
41 exit 0
42 fi
43
44 -: ${EROOT:="${EPREFIX}/"}
45 +: "${EROOT:=${EPREFIX}/}"
46 if [[ ${EROOT} != "/" ]] ; then
47 einfo "Using locale.gen from ${EROOT}etc/"
48 fi
49 @@ -132,7 +132,7 @@ else
50 DESTDIR=${EROOT}
51 fi
52
53 -: ${CONFIG:=${EROOT}etc/locale.gen}
54 +: "${CONFIG:=${EROOT}etc/locale.gen}"
55 LOCALES=${DESTDIR}usr/share/i18n/locales
56 CHARMAPS=${DESTDIR}usr/share/i18n/charmaps
57 SUPPORTED=${DESTDIR}usr/share/i18n/SUPPORTED