* Easy Install: put the log directly in /tmp instead of in the build

  directory so it doesn't get deleted on a failed install.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 21bd15fadaf4e5e02471c9c63f74a082293dfb65..b8878002c968c1493a6b961764f93f772c5df7e9 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 626.16  2004/11/02 02:47:10  ajc
+ * Easy Install: put the log directly in /tmp instead of in the build
+   directory so it doesn't get deleted on a failed install.
+
  Revision 626.15  2004/10/23 14:33:44  ajc
  * serv_notes.c: finished.  When saving a message in a room whose view
    is set to "notes," look for an X-KOrg-Note-Id: header, and if one is
@@ -6178,3 +6182,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/newinstall.sh b/citadel/newinstall.sh
index d8fed66010681c46baca6b8fbfbd20f4228db532..633a8ce0231ec975ebeba2700fb4db698401c426 100644 (file)
--- a/citadel/newinstall.sh
+++ b/citadel/newinstall.sh
@@ -70,7 +70,9 @@
 SUPPORT=/usr/local/ctdlsupport
 CITADEL=/usr/local/citadel
 WEBCIT=/usr/local/webcit
-BUILD=/tmp/citadel-build.$$
+WORKDIR=/tmp
+BUILD=$WORKDIR/citadel-build.$$
+LOG=$WORKDIR/citadel-install-log.txt
 export SUPPORT CITADEL WEBCIT
 
 MAKEOPTS=""
@@ -110,13 +112,13 @@ WEBCIT_SOURCE=webcit-easyinstall.tar.gz
 
 SETUP="Citadel Easy Install"
 
-LOG=$BUILD/log.txt
 
 ##### BEGIN Functions #####
 
 die () {
        echo Easy Install is aborting.
        echo Please report this problem to the Citadel developers.
+       echo Log file: $LOG
        rm -fr $BUILD
        exit 1
 }