diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-08-15 13:05:30 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-08-15 13:05:30 (EDT) |
| commit | 004381c70359318a0598271f7fcc52d75c80843e (patch) | |
| tree | bfed49e3c4db0f0f408327095aefbc8eef0b272b | |
| parent | 3e8d1ec6ca4c6aa6420b59f0591e7c4de64e26bc (diff) | |
install: Move suite and profile setting code
| -rw-r--r-- | lib/cmd/install.sh | 17 |
1 files changed, 8 insertions, 9 deletions
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}" } |