From dfefe9c856a581eaafe506cdb7b8f0f189b40e0a Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Mon, 1 Jun 2015 01:05:04 +0200
Subject: [PATCH] [basestrap] revert the branch experiments

---
 bin/basestrap.in | 11 ++++++-----
 bin/buildpkg.in  |  2 +-
 bin/mkchroot.in  |  5 ++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/basestrap.in b/bin/basestrap.in
index 216bfcc..648fd1c 100644
--- a/bin/basestrap.in
+++ b/bin/basestrap.in
@@ -50,10 +50,11 @@ usage() {
 
 orig_argv=("$@")
 
-while getopts ':C:cdGiM' flag; do
+opts=':C:cdGiM'
+
+while getopts ${opts} flag; do
 	case ${arg} in
 		C) pacman_config=$OPTARG ;;
-		b) branch=$OPTARG ;;
 		d) directory=true ;;
 		c) hostcache=true ;;
 		i) interactive=true ;;
@@ -106,9 +107,9 @@ fi
 
 if ${copymirrorlist}; then
 	# install the host's mirrorlist onto the new root
-	#cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/"
-	cp -a ${PKGDATADIR}/pacman-mirrors-${branch}.conf "$newroot/etc" #/pacman.d/"
-	pacman-mirrors -g -b ${branch}
+	cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/"
+	#cp -a ${PKGDATADIR}/pacman-mirrors-${branch}.conf "$newroot/etc" #/pacman.d/"
+	#pacman-mirrors -g -b ${branch}
 fi
 
 # vim: et ts=2 sw=2 ft=sh:
diff --git a/bin/buildpkg.in b/bin/buildpkg.in
index 91f5e57..cdeb9b3 100644
--- a/bin/buildpkg.in
+++ b/bin/buildpkg.in
@@ -163,7 +163,7 @@ pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
 makepkg_conf="${PKGDATADIR}/makepkg-${arch}.conf"
 mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
 
-mkchroot_args+=(-b ${branch} -C ${pacman_conf} -M ${makepkg_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}")
+mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}")
 
 mkchrootpkg_args+=(-r ${work_dir})
 
diff --git a/bin/mkchroot.in b/bin/mkchroot.in
index 2d5ca3d..05560d2 100644
--- a/bin/mkchroot.in
+++ b/bin/mkchroot.in
@@ -33,7 +33,7 @@ usage() {
 
 orig_argv=("$@")
 
-opts='hLC:M:S:c:b:B:'
+opts='hLC:M:S:c:B:'
 
 while getopts ${opts} arg; do
 	case "${arg}" in
@@ -41,7 +41,6 @@ while getopts ${opts} arg; do
 		M) makepkg_conf="$OPTARG" ;;
 		S) mirrors_conf="$OPTARG" ;;
 		c) cache_dir="$OPTARG" ;;
-		b) branch="$OPTARG" ;;
 		L) build_locales=true ;;
 		B) build_mirror="$OPTARG" ;;
 		h|?) usage ;;
@@ -83,7 +82,7 @@ if [[ $(stat -f -c %T "$working_dir") == btrfs ]]; then
 	chmod 0755 "$working_dir"
 fi
 
-basestrap ${branch:+-b ${branch}} -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'
 
 echo "$version" > "$working_dir/.manjaro-tools"