From 004381c70359318a0598271f7fcc52d75c80843e Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Fri, 15 Aug 2014 13:05:30 -0400 Subject: install: Move suite and profile setting code --- diff --git a/lib/cmd/install.sh b/lib/cmd/install.sh index cdf6541..d1ec81d 100644 --- a/lib/cmd/install.sh +++ b/lib/cmd/install.sh @@ -42,26 +42,25 @@ cmd_install_main() suite="${1}" chroot="${2}" - if [ "x${cmd_install_opt_a+set}" = 'xset' ]; then - arch="${cmd_install_opt_a}" - fi - if [ "x${cmd_install_opt_P+set}" = 'xset' ]; then - plat="${cmd_install_opt_P}" - fi - if [ "x${suite%%:*}" != "x${suite}" ]; then profile="${suite%%:*}" suite="${suite#*:}" else profile='proteanos' fi + profile_set "${profile}" + + if [ "x${cmd_install_opt_a+set}" = 'xset' ]; then + arch="${cmd_install_opt_a}" + fi + if [ "x${cmd_install_opt_P+set}" = 'xset' ]; then + plat="${cmd_install_opt_P}" + fi if ! mkdir "${chroot}" || ! mkdir "${chroot}/.prokit"; then : Error fi - profile_set "${profile}" - cmd_install_find_pkgs "${suite}" "${arch}" "${plat}" "${chroot}" } -- cgit v0.9.1