diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-07-11 04:37:22 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-07-11 04:37:22 +0000 |
| commit | 7587c1a5ffa1c5856c89f6f187cf7b75b634c3b1 (patch) | |
| tree | a9082aa5eec3b33ec2732c814ae46ad4df7ff2f8 | |
| parent | 6e4c49f4d328cf53900354460e79c69b4fab96a8 (diff) | |
EDITOR or VISUAL are not a path. They are a string that needs to be
added to the front of the file, then sent through system() of equiv.
ok aja
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index e58715058e1..1f20a32b76d 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.79 2011/07/11 04:10:47 deraadt Exp $ +# $OpenBSD: sysmerge.sh,v 1.80 2011/07/11 04:37:21 deraadt Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009, 2010, 2011 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -279,11 +279,7 @@ merge_loop() { else EDIT="${VISUAL}" fi - if which ${EDIT} >/dev/null 2>&1; then - ${EDIT} ${COMPFILE}.merged - else - echo "\t*** ERROR: ${EDIT} can not be found or is not executable" - fi + ${EDIT} ${COMPFILE}.merged INSTALL_MERGED=v ;; [iI]) |