From 4124e691b3d185807611666fbd3752e2b494ed22 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sat, 27 Jul 2002 20:15:07 +0000
Subject: [PATCH] Changed tests for joe editor

---
 ChangeLog                    | 4 ++++
 script/Makefile              | 4 +++-
 script/{editor => editor.in} | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 rename script/{editor => editor.in} (99%)

diff --git a/ChangeLog b/ChangeLog
index 9c59a9c1..0759b49e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ v0.35.03	06-Jul-2002
 	common.a:
 		Added nodelist override to the nodelist lookup function.
 		Added protection against emty rfc headers with only a space.
+		Added test for HA archiver.
 
 	lang:
 		Corrected a spelling error in the Dutch language file.
@@ -38,6 +39,7 @@ v0.35.03	06-Jul-2002
 		When a user paged the sysop for a chat, after the timer was
 		expired, the bbs crashed.
 		Fixed a problem with extra spaces in UUCP replyto address.
+		Added test for HA archiver.
 
 	mbtask:
 		Changed logging of multiple logmessages that are equal.
@@ -59,6 +61,8 @@ v0.35.03	06-Jul-2002
 	script:
 		The bbsdoor.sh and rundoor.sh scripts are now only installed
 		if they were not installed before.
+		Added better support for different locations of the external
+		editor joe.
 
 	examples:
 		With the aid of a little utility (endian) the right menus are
diff --git a/script/Makefile b/script/Makefile
index f51a065a..0ff1fe37 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -39,12 +39,15 @@ install:
 			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 hatch       ${BINDIR}" ; \
 		fi
 		@if [ -x ${JOEBIN}/joe ]; then \
+			echo "Installing support for joe editor" ; \
 			rm -f ${JOEBIN}/bbsjoe ; \
 			rm -f ${JOEBIN}/bbsjmacs ; \
 			echo "ln -s ${JOEBIN}/joe ${JOEBIN}/bbsjoe" ; \
 			ln -s ${JOEBIN}/joe ${JOEBIN}/bbsjoe ; \
 			echo "ln -s ${JOEBIN}/joe ${JOEBIN}/bbsjmacs" ; \
 			ln -s ${JOEBIN}/joe ${JOEBIN}/bbsjmacs ; \
+			${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 editor      ${BINDIR} ; \
+			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 editor      ${BINDIR}" ; \
 		fi
 		@if [ -d ${JOELIB} ]; then \
 			${INSTALL} -c -o root -g root -m 0644 bbsjoerc    ${JOELIB} ; \
@@ -52,7 +55,6 @@ install:
 			${INSTALL} -c -o root -g root -m 0644 bbsjmacsrc  ${JOELIB} ; \
 			echo "${INSTALL} -c -o root -g root -m 0644 bbsjmacsrc  ${JOELIB}" ; \
 		fi
-		${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 editor      ${BINDIR}
 		@if [ ! -x ${BINDIR}/bbsdoor.sh ]; then \
 			${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 bbsdoor.sh  ${BINDIR} ; \
 			echo "${INSTALL} -c -o ${OWNER} -g ${GROUP}  -m 0755 bbsdoor.sh  ${BINDIR}" ; \
diff --git a/script/editor b/script/editor.in
similarity index 99%
rename from script/editor
rename to script/editor.in
index 44a19a7d..e5770bfd 100644
--- a/script/editor
+++ b/script/editor.in
@@ -22,7 +22,7 @@ export JOETERM=ansi.sys
 TIME=`head -n19 ~/door.sys  |tail -n1  |tr -d "[:cntrl:]"`
 
 ## Set preferred editor and parameters
-EDITOR=/usr/bin/bbsjoe
+EDITOR=@joebin@/bbsjoe
 PARAM="~/edit.msg"
 
 # Using joe with emacs keys: