diff options
| author | jkh <jkh@FreeBSD.org> | 1995-10-16 15:14:28 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-10-16 15:14:28 +0000 |
| commit | 1c55fdbaae54fa424f0c2cd826657d24bab0cbab (patch) | |
| tree | 50bc7f170b9457e6b406c14c9cae37eff14ef8e2 /release/sysinstall/package.c | |
| parent | d29267034077955b981a4e54f7059e4d8bb11b58 (diff) | |
| download | FreeBSD-src-1c55fdbaae54fa424f0c2cd826657d24bab0cbab.zip FreeBSD-src-1c55fdbaae54fa424f0c2cd826657d24bab0cbab.tar.gz | |
Fix many more bogons, add some stuff to make the docs folk happy.
Diffstat (limited to 'release/sysinstall/package.c')
| -rw-r--r-- | release/sysinstall/package.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index 082cd4e..f1cd085 100644 --- a/release/sysinstall/package.c +++ b/release/sysinstall/package.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.71.2.31 1995/10/15 04:37:05 jkh Exp $ + * $Id: package.c,v 1.1 1995/10/15 12:41:05 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -61,6 +61,10 @@ package_extract(Device *dev, char *name) char *where; int i, fd, ret; + /* Check to make sure it's not already there */ + if (!vsystem("pkg_info -e %s")) + return RET_SUCCESS; + if (!dev->init(dev)) return RET_FAIL; @@ -90,7 +94,7 @@ package_extract(Device *dev, char *name) close(fd); tpid = waitpid(tpid, &pstat, 0); if (vsystem("(pwd; cat +CONTENTS) | pkg_add %s-S", - variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v " : "") + !strcmp(variable_get(CPIO_VERBOSITY_LEVEL), "high") ? "-v " : "")) msgConfirm("An error occurred while trying to pkg_add %s.\n" "Please check debugging screen for possible further details.", path); else |
