aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1995-05-26 08:59:29 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1995-05-26 08:59:29 +0000
commit39c1b38efa5930d92ae93056b59ac20a440ba75e (patch)
treefac76a4e6c3dbc1284b1c25917de802081095d34 /usr.sbin
parent3c4d1d3edb04d6c29e118dac38aae63d570b7dff (diff)
downloadsrc-39c1b38efa5930d92ae93056b59ac20a440ba75e.tar.gz
src-39c1b38efa5930d92ae93056b59ac20a440ba75e.zip
Make the installation menu loop on the provided package directory (if one
is provided).
Notes
Notes: svn path=/head/; revision=8758
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_manage/pkg_ui.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/usr.sbin/pkg_manage/pkg_ui.c b/usr.sbin/pkg_manage/pkg_ui.c
index 876022bc4b69..41f53281ff9b 100644
--- a/usr.sbin/pkg_manage/pkg_ui.c
+++ b/usr.sbin/pkg_manage/pkg_ui.c
@@ -211,14 +211,23 @@ install_batch(void)
use_helpfile(DS_INSTALL_HLP);
quit = FALSE;
while (!quit) {
+ if (StartDir) {
use_helpline("Select directory where the pkg's reside");
- if (dialog_dselect(StartDir ? StartDir : ".", "*.tgz")) {
+ if (dialog_dselect(".", "*.tgz")) {
quit = TRUE;
} else {
install_pkgs_indir();
}
- }
+ else {
+ use_helpline("Select directory where the pkg's reside");
+ if (dialog_dselect(".", "*.tgz")) {
+ quit = TRUE;
+ } else {
+ install_pkgs_indir();
+ }
+ }
+ }
return;
} /* install_batch() */