Commit 2eac6c6

committed

Default locale - C

1 parent e51ed0b commit 2eac6c6Copy full SHA for 2eac6c6

File tree

2 files changed

-9

lines changed

include
- bootstrap/fedora
  - deploy.sh
- core/locale
  - deploy.sh

2 files changed

-9

lines changed

`‎include/bootstrap/fedora/deploy.sh‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,10 @@ yum_repository()`
`31`	`31`	`{`
`32`	`32`	`find "${CHROOT_DIR}/etc/yum.repos.d/" -name '.repo' \| while read f; do sed -i 's/^enabled=./enabled=0/g' "${f}"; done`
`33`	`33`	`local repo_file="${CHROOT_DIR}/etc/yum.repos.d/fedora-${SUITE}-${ARCH}.repo"`
	`34`	`+ local repo_url`
`34`	`35`	`if [ "${ARCH}" = "i386" ]`
`35`		`- then localrepo_url="${SOURCE_PATH%/}/fedora-secondary/releases/${SUITE}/Everything/${ARCH}/os"`
`36`		`- else localrepo_url="${SOURCE_PATH%/}/fedora/linux/releases/${SUITE}/Everything/${ARCH}/os"`
	`36`	`+ then repo_url="${SOURCE_PATH%/}/fedora-secondary/releases/${SUITE}/Everything/${ARCH}/os"`
	`37`	`+ else repo_url="${SOURCE_PATH%/}/fedora/linux/releases/${SUITE}/Everything/${ARCH}/os"`
`37`	`38`	`fi`
`38`	`39`	`echo "[fedora-${SUITE}-${ARCH}]" > "${repo_file}"`
`39`	`40`	`echo "name=Fedora ${SUITE} - ${ARCH}" >> "${repo_file}"`
`@@ -53,13 +54,12 @@ do_install()`
`53`	`54`
`54`	`55`	local base_packages="audit-libs basesystem bash bash-completion bzip2-libs ca-certificates chkconfig coreutils cpio cracklib crypto-policies cryptsetup-libs curl cyrus-sasl-lib dbus dbus-libs device-mapper-libs dnf dnf-conf dnf-plugins-core dnf-yum elfutils-libelf elfutils-libs expat fedora-gpg-keys fedora-release fedora-repos file-libs filesystem gawk gdbm glib2 glibc glibc-common gmp gnupg2 gnutls gobject-introspection gpgme grep gzip info iptables-libs json-c keyutils-libs kmod-libs krb5-libs libacl libarchive libargon2 libassuan libattr libblkid libcap libcap-ng libcom_err libcomps libcurl libdb libdb-utils libdnf libffi libgcc libgcrypt libgpg-error libidn2 libmetalink libmodulemd libmount libnghttp2 libnsl2 libpcap libpsl libpwquality librepo libreport-filesystem libseccomp libselinux libsemanage libsepol libsigsegv libsmartcols libsolv libssh libtasn1 libtirpc libunistring libutempter libuuid libverto libxcrypt libxml2 libyaml libzstd lua-libs lz4-libs mpfr ncurses ncurses-base ncurses-libs nettle nspr nss nss-softokn nss-softokn-freebl nss-sysinit nss-util openldap openssl-libs p11-kit p11-kit-trust pam pcre pcre2 popt python3 python3-dnf python3-dnf-plugins-core python3-gobject-base python3-gpg python3-hawkey python3-iniparse python3-libcomps python3-librepo python3-libs python3-pip python3-rpm python3-setuptools python3-six python3-smartcols qrencode-libs readline rootfiles rpm rpm-build-libs rpm-libs rpm-plugin-selinux sed setup shadow-utils sqlite-libs sudo systemd systemd-libs tzdata util-linux vim-minimal which xz-libs zlib"
`55`	`56`
	`57`	`+ local repo_url`
`56`	`58`	`if [ "${ARCH}" = "i386" ]`
`57`		`- then localrepo_url="${SOURCE_PATH%/}/fedora-secondary/releases/${SUITE}/Everything/${ARCH}/os"`
`58`		`- else localrepo_url="${SOURCE_PATH%/}/fedora/linux/releases/${SUITE}/Everything/${ARCH}/os"`
	`59`	`+ then repo_url="${SOURCE_PATH%/}/fedora-secondary/releases/${SUITE}/Everything/${ARCH}/os"`
	`60`	`+ else repo_url="${SOURCE_PATH%/}/fedora/linux/releases/${SUITE}/Everything/${ARCH}/os"`
`59`	`61`	`fi`
`60`	`62`
`61`		`- msg "URL: ${repo_url}"`
`62`		`-`
`63`	`63`	`msg -n "Preparing for deployment ... "`
`64`	`64`	`tar xzf "${COMPONENT_DIR}/filesystem.tgz" -C "${CHROOT_DIR}"`
`65`	`65`	`is_ok "fail" "done" \|\| return 1`

`‎include/core/locale/deploy.sh‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,15 @@`
`3`	`3`	`# (c) Anton Skshidlevsky <meefik@gmail.com>, GPLv3`
`4`	`4`
`5`	`5`	`[ -n "${LOCALE}" ] \|\| LOCALE="${LANG}"`
	`6`	`+[ -n "${LOCALE}" ] \|\| LOCALE="C"`
`6`	`7`
`7`	`8`	`do_configure()`
`8`	`9`	`{`
`9`	`10`	`msg ":: Configuring ${COMPONENT} ... "`
`10`		`- if [ -n"${LOCALE}"-a"${LOCALE}"!="C"-a"${LOCALE}"!="POSIX" ]; then`
	`11`	`+ if $(echo ${LOCALE}\| grep -q '\.'); then`
`11`	`12`	`local inputfile=$(echo ${LOCALE} \| awk -F. '{print 1ドル}')`
`12`	`13`	`local charmapfile=$(echo ${LOCALE} \| awk -F. '{print 2ドル}')`
`13`	`14`	`chroot_exec -u root localedef -i ${inputfile} -c -f ${charmapfile} ${LOCALE}`
`14`		`- else`
`15`		`- LOCALE="C"`
`16`	`15`	`fi`
`17`	`16`	`case "${DISTRIB}" in`
`18`	`17`	`debian\|ubuntu\|kali)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2eac6c6

File tree

2 files changed

2 files changed

`‎include/bootstrap/fedora/deploy.sh‎`

`‎include/core/locale/deploy.sh‎`

0 commit comments