d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename installX11package() to installPackage() and tweak it so that it

Browse Source 
can be used to install any arbitrary package.

Approved by:	re
This commit is contained in:
John Baldwin 2002-12-03 19:36:12 +00:00
parent 194a666749
commit 544cd27071
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/sade/install.c
View File

@ -842,20 +842,18 @@ installFixupBin(dialogMenuItem *self)
return DITEM_SUCCESS | DITEM_RESTORE; return DITEM_SUCCESS | DITEM_RESTORE;
} }
#ifdef X_AS_PKG
int int
installX11package(dialogMenuItem *self) installPackage(dialogMenuItem *self, char *desc, char *package)
{ {
WINDOW *w = savescr(); WINDOW *w = savescr();
int i; int i;
dialog_clear_norefresh(); dialog_clear_norefresh();
msgNotify("Installing XFree86 package..."); msgNotify("Installing %s package...", desc);
i = package_add("XFree86-4"); i = package_add(package);
restorescr(w); restorescr(w);
return i; return i;
} }
#endif
/* Fix side-effects from the the XFree86 installation */ /* Fix side-effects from the the XFree86 installation */
int int

2
usr.sbin/sade/sade.h
View File

@ -642,7 +642,7 @@ extern int installUpgrade(dialogMenuItem *self);
extern int installFilesystems(dialogMenuItem *self); extern int installFilesystems(dialogMenuItem *self);
extern int installVarDefaults(dialogMenuItem *self); extern int installVarDefaults(dialogMenuItem *self);
extern void installEnvironment(void); extern void installEnvironment(void);
extern int installX11package(dialogMenuItem *self); extern int installPackage(dialogMenuItem *self, char *package, char *desc);
extern Boolean copySelf(void); extern Boolean copySelf(void);
/* kget.c */ /* kget.c */

8
usr.sbin/sysinstall/install.c
View File

@ -842,20 +842,18 @@ installFixupBin(dialogMenuItem *self)
return DITEM_SUCCESS | DITEM_RESTORE; return DITEM_SUCCESS | DITEM_RESTORE;
} }
#ifdef X_AS_PKG
int int
installX11package(dialogMenuItem *self) installPackage(dialogMenuItem *self, char *desc, char *package)
{ {
WINDOW *w = savescr(); WINDOW *w = savescr();
int i; int i;
dialog_clear_norefresh(); dialog_clear_norefresh();
msgNotify("Installing XFree86 package..."); msgNotify("Installing %s package...", desc);
i = package_add("XFree86-4"); i = package_add(package);
restorescr(w); restorescr(w);
return i; return i;
} }
#endif
/* Fix side-effects from the the XFree86 installation */ /* Fix side-effects from the the XFree86 installation */
int int

2
usr.sbin/sysinstall/sysinstall.h
View File

@ -642,7 +642,7 @@ extern int installUpgrade(dialogMenuItem *self);
extern int installFilesystems(dialogMenuItem *self); extern int installFilesystems(dialogMenuItem *self);
extern int installVarDefaults(dialogMenuItem *self); extern int installVarDefaults(dialogMenuItem *self);
extern void installEnvironment(void); extern void installEnvironment(void);
extern int installX11package(dialogMenuItem *self); extern int installPackage(dialogMenuItem *self, char *package, char *desc);
extern Boolean copySelf(void); extern Boolean copySelf(void);
/* kget.c */ /* kget.c */