root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

add arg to allow unaltered locale.gen

Browse source
This commit is contained in:
udeved 2015-01-02 18:26:27 +01:00
parent 99ee9ec1c8
commit 23886abe14
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/mkchroot.in
View file

@ -15,6 +15,7 @@ version=@version@
[[ -r @libdir@/util.sh ]] && source @libdir@/util.sh [[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
working_dir='' working_dir=''
build_locales=false
usage() { usage() {
echo "Usage: ${0##*/} [options] working-dir package-list..." echo "Usage: ${0##*/} [options] working-dir package-list..."
@ -29,12 +30,13 @@ usage() {
orig_argv=("$@") orig_argv=("$@")
while getopts 'hC:M:S:c:' arg; do while getopts 'hbC:M:S:c:' arg; do
case "$arg" in case "$arg" in
C) pac_conf="$OPTARG" ;; C) pac_conf="$OPTARG" ;;
M) makepkg_conf="$OPTARG" ;; M) makepkg_conf="$OPTARG" ;;
S) mirrors_conf="$OPTARG" ;; S) mirrors_conf="$OPTARG" ;;
c) cache_dir="$OPTARG" ;; c) cache_dir="$OPTARG" ;;
b) build_locales=true ;;
h|?) usage ;; h|?) usage ;;
*) error "invalid argument '$arg'"; usage ;; *) error "invalid argument '$arg'"; usage ;;
esac esac
@ -76,7 +78,7 @@ fi
basestrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ basestrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen" ${build_locales} && printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
echo 'LANG=C' > "$working_dir/etc/locale.conf" echo 'LANG=C' > "$working_dir/etc/locale.conf"
echo "$version" > "$working_dir/.manjaro-tools" echo "$version" > "$working_dir/.manjaro-tools"