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

Add some extra checks to make *sure* we got what we were told we got.

Browse Source
This commit is contained in:
jkh 1999-05-12 09:22:47 +00:00
parent 95973a7b6f
commit 92a76e707b
3 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
release/sysinstall/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * generation being essentially a complete rewrite.
* *
* $Id: config.c,v 1.130 1999/05/12 04:52:40 jkh Exp $ * $Id: config.c,v 1.131 1999/05/12 09:02:32 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -472,6 +472,18 @@ write_root_xprofile(char *str)
} }
} }
static int
gotit(char *fname)
{
char tmp[FILENAME_MAX];
snprintf(tmp, sizeof tmp, "/usr/X11R6/bin/%s", fname);
if (file_executable(tmp))
return TRUE;
snprintf(tmp, sizeof tmp, "/usr/local/bin/%s", fname);
return file_executable(tmp);
}
int int
configXDesktop(dialogMenuItem *self) configXDesktop(dialogMenuItem *self)
{ {
@ -483,32 +495,32 @@ configXDesktop(dialogMenuItem *self)
return DITEM_FAILURE; return DITEM_FAILURE;
if (!strcmp(desk, "kde")) { if (!strcmp(desk, "kde")) {
ret = package_add("kde"); ret = package_add("kde");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde"))
write_root_xprofile("exec startkde\n"); write_root_xprofile("exec startkde\n");
} }
else if (!strcmp(desk, "gnome")) { else if (!strcmp(desk, "gnome")) {
ret = package_add("gnomecore"); ret = package_add("gnomecore");
if (DITEM_STATUS(ret) != DITEM_FAILURE) { if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) {
ret = package_add("afterstep"); ret = package_add("afterstep");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep"))
write_root_xprofile("gnome-session &\nexec afterstep"); write_root_xprofile("gnome-session &\nexec afterstep");
} }
} }
else if (!strcmp(desk, "afterstep")) { else if (!strcmp(desk, "afterstep")) {
ret = package_add("afterstep"); ret = package_add("afterstep");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep"))
write_root_xprofile("xterm &\nexec afterstep\n"); write_root_xprofile("xterm &\nexec afterstep\n");
} }
else if (!strcmp(desk, "windowmaker")) { else if (!strcmp(desk, "windowmaker")) {
ret = package_add("windowmaker"); ret = package_add("windowmaker");
if (DITEM_STATUS(ret) != DITEM_FAILURE) { if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("wmaker.inst")) {
vsystem("/usr/X11R6/bin/wmaker.inst"); vsystem("/usr/X11R6/bin/wmaker.inst");
write_root_xprofile("xterm &\nexec wmaker\n"); write_root_xprofile("xterm &\nexec wmaker\n");
} }
} }
else if (!strcmp(desk, "enlightenment")) { else if (!strcmp(desk, "enlightenment")) {
ret = package_add("enlightenment"); ret = package_add("enlightenment");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment"))
write_root_xprofile("xterm &\nexec enlightenment\n"); write_root_xprofile("xterm &\nexec enlightenment\n");
} }
if (DITEM_STATUS(ret) == DITEM_FAILURE) if (DITEM_STATUS(ret) == DITEM_FAILURE)

26
usr.sbin/sade/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * generation being essentially a complete rewrite.
* *
* $Id: config.c,v 1.130 1999/05/12 04:52:40 jkh Exp $ * $Id: config.c,v 1.131 1999/05/12 09:02:32 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -472,6 +472,18 @@ write_root_xprofile(char *str)
} }
} }
static int
gotit(char *fname)
{
char tmp[FILENAME_MAX];
snprintf(tmp, sizeof tmp, "/usr/X11R6/bin/%s", fname);
if (file_executable(tmp))
return TRUE;
snprintf(tmp, sizeof tmp, "/usr/local/bin/%s", fname);
return file_executable(tmp);
}
int int
configXDesktop(dialogMenuItem *self) configXDesktop(dialogMenuItem *self)
{ {
@ -483,32 +495,32 @@ configXDesktop(dialogMenuItem *self)
return DITEM_FAILURE; return DITEM_FAILURE;
if (!strcmp(desk, "kde")) { if (!strcmp(desk, "kde")) {
ret = package_add("kde"); ret = package_add("kde");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde"))
write_root_xprofile("exec startkde\n"); write_root_xprofile("exec startkde\n");
} }
else if (!strcmp(desk, "gnome")) { else if (!strcmp(desk, "gnome")) {
ret = package_add("gnomecore"); ret = package_add("gnomecore");
if (DITEM_STATUS(ret) != DITEM_FAILURE) { if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) {
ret = package_add("afterstep"); ret = package_add("afterstep");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep"))
write_root_xprofile("gnome-session &\nexec afterstep"); write_root_xprofile("gnome-session &\nexec afterstep");
} }
} }
else if (!strcmp(desk, "afterstep")) { else if (!strcmp(desk, "afterstep")) {
ret = package_add("afterstep"); ret = package_add("afterstep");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep"))
write_root_xprofile("xterm &\nexec afterstep\n"); write_root_xprofile("xterm &\nexec afterstep\n");
} }
else if (!strcmp(desk, "windowmaker")) { else if (!strcmp(desk, "windowmaker")) {
ret = package_add("windowmaker"); ret = package_add("windowmaker");
if (DITEM_STATUS(ret) != DITEM_FAILURE) { if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("wmaker.inst")) {
vsystem("/usr/X11R6/bin/wmaker.inst"); vsystem("/usr/X11R6/bin/wmaker.inst");
write_root_xprofile("xterm &\nexec wmaker\n"); write_root_xprofile("xterm &\nexec wmaker\n");
} }
} }
else if (!strcmp(desk, "enlightenment")) { else if (!strcmp(desk, "enlightenment")) {
ret = package_add("enlightenment"); ret = package_add("enlightenment");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment"))
write_root_xprofile("xterm &\nexec enlightenment\n"); write_root_xprofile("xterm &\nexec enlightenment\n");
} }
if (DITEM_STATUS(ret) == DITEM_FAILURE) if (DITEM_STATUS(ret) == DITEM_FAILURE)

26
usr.sbin/sysinstall/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next * This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite. * generation being essentially a complete rewrite.
* *
* $Id: config.c,v 1.130 1999/05/12 04:52:40 jkh Exp $ * $Id: config.c,v 1.131 1999/05/12 09:02:32 jkh Exp $
* *
* Copyright (c) 1995 * Copyright (c) 1995
* Jordan Hubbard. All rights reserved. * Jordan Hubbard. All rights reserved.
@ -472,6 +472,18 @@ write_root_xprofile(char *str)
} }
} }
static int
gotit(char *fname)
{
char tmp[FILENAME_MAX];
snprintf(tmp, sizeof tmp, "/usr/X11R6/bin/%s", fname);
if (file_executable(tmp))
return TRUE;
snprintf(tmp, sizeof tmp, "/usr/local/bin/%s", fname);
return file_executable(tmp);
}
int int
configXDesktop(dialogMenuItem *self) configXDesktop(dialogMenuItem *self)
{ {
@ -483,32 +495,32 @@ configXDesktop(dialogMenuItem *self)
return DITEM_FAILURE; return DITEM_FAILURE;
if (!strcmp(desk, "kde")) { if (!strcmp(desk, "kde")) {
ret = package_add("kde"); ret = package_add("kde");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde"))
write_root_xprofile("exec startkde\n"); write_root_xprofile("exec startkde\n");
} }
else if (!strcmp(desk, "gnome")) { else if (!strcmp(desk, "gnome")) {
ret = package_add("gnomecore"); ret = package_add("gnomecore");
if (DITEM_STATUS(ret) != DITEM_FAILURE) { if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) {
ret = package_add("afterstep"); ret = package_add("afterstep");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep"))
write_root_xprofile("gnome-session &\nexec afterstep"); write_root_xprofile("gnome-session &\nexec afterstep");
} }
} }
else if (!strcmp(desk, "afterstep")) { else if (!strcmp(desk, "afterstep")) {
ret = package_add("afterstep"); ret = package_add("afterstep");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep"))
write_root_xprofile("xterm &\nexec afterstep\n"); write_root_xprofile("xterm &\nexec afterstep\n");
} }
else if (!strcmp(desk, "windowmaker")) { else if (!strcmp(desk, "windowmaker")) {
ret = package_add("windowmaker"); ret = package_add("windowmaker");
if (DITEM_STATUS(ret) != DITEM_FAILURE) { if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("wmaker.inst")) {
vsystem("/usr/X11R6/bin/wmaker.inst"); vsystem("/usr/X11R6/bin/wmaker.inst");
write_root_xprofile("xterm &\nexec wmaker\n"); write_root_xprofile("xterm &\nexec wmaker\n");
} }
} }
else if (!strcmp(desk, "enlightenment")) { else if (!strcmp(desk, "enlightenment")) {
ret = package_add("enlightenment"); ret = package_add("enlightenment");
if (DITEM_STATUS(ret) != DITEM_FAILURE) if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment"))
write_root_xprofile("xterm &\nexec enlightenment\n"); write_root_xprofile("xterm &\nexec enlightenment\n");
} }
if (DITEM_STATUS(ret) == DITEM_FAILURE) if (DITEM_STATUS(ret) == DITEM_FAILURE)