diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/filesystem/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/filesystem/locale.sh | 22 | ||||
| -rw-r--r-- | libre/filesystem/nsswitch.conf | 2 | ||||
| -rw-r--r-- | libre/filesystem/profile | 2 |
4 files changed, 16 insertions, 20 deletions
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 264690b2d..dc00f5088 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar> pkgname=filesystem -pkgver=2017.10 -pkgrel=2.parabola2 +pkgver=2018.1 +pkgrel=2.parabola1 pkgdesc='Base Parabola GNU/Linux-libre files' arch=('i686' 'x86_64' 'armv7h') license=('GPL') @@ -32,12 +32,12 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82' 'd9cd8a77d9e0aa5e90d7f4ed74c8745c17b525e720e28e4c44364150003c35f9' '3ad448c78cab733759ae3365620504b1444e854effd066f1c7174652f046ebe1' 'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5' - '331805ff85b80ae2444be58740f1cf41be56fb6e254e930677f1e36e8f95bee1' + '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10' 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' - 'c2d603373e1c6db0acdd79ec36cbe19920b5213d6b76f9d56b2a5010bad8d7cd' + 'dffc5b0b221bee0e3f7fd3f6db86231a6177f4b5ebba6e879f9e0e044abde9b8' '463dbccba0275ee80c532755c7048cb9ded83658a33a82f344aaf1520704f2ac' '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a' - '1c410e2e90f5cc1252c1a6915db080f9d5f8fb47fae4cc6e85b78ed3c3fb9d17' + '5da078777cda24e4df697e2928451723f2303bfdbb2ce9551c822188c7945d25' '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c' 'd88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b' '8ce994663d7588143ad7ed4441b07f468f4f7d3590164dd73ddfa3ea307ece8e' diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh index 11b7dc9ec..48dd748da 100644 --- a/libre/filesystem/locale.sh +++ b/libre/filesystem/locale.sh @@ -1,5 +1,8 @@ #!/bin/sh +# load locale.conf in XDG paths. +# /etc/locale.conf loads and overrides by kernel command line is done by systemd +# But we override it here, see FS#56688 if [ -z "$LANG" ]; then if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then . "$XDG_CONFIG_HOME/locale.conf" @@ -10,17 +13,10 @@ if [ -z "$LANG" ]; then fi fi +# define default LANG to C if not already defined LANG=${LANG:-C} -export LANG -[ -n "$LC_CTYPE" ] && export LC_CTYPE -[ -n "$LC_NUMERIC" ] && export LC_NUMERIC -[ -n "$LC_TIME" ] && export LC_TIME -[ -n "$LC_COLLATE" ] && export LC_COLLATE -[ -n "$LC_MONETARY" ] && export LC_MONETARY -[ -n "$LC_MESSAGES" ] && export LC_MESSAGES -[ -n "$LC_PAPER" ] && export LC_PAPER -[ -n "$LC_NAME" ] && export LC_NAME -[ -n "$LC_ADDRESS" ] && export LC_ADDRESS -[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE -[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT -[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION + +# export all locale (7) variables when they exist +export LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \ + LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \ + LC_IDENTIFICATION diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem/nsswitch.conf index 39f365655..5efe071f3 100644 --- a/libre/filesystem/nsswitch.conf +++ b/libre/filesystem/nsswitch.conf @@ -7,7 +7,7 @@ shadow: files publickey: files -hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname +hosts: files mymachines myhostnames resolve [!UNAVAIL=return] dns networks: files protocols: files diff --git a/libre/filesystem/profile b/libre/filesystem/profile index f92cf3f74..a4f717734 100644 --- a/libre/filesystem/profile +++ b/libre/filesystem/profile @@ -9,7 +9,7 @@ appendpath () { *:"$1":*) ;; *) - PATH="$PATH:$1" + PATH="${PATH:+$PATH:}$1" esac } |