--- email.conf.orig 2008-11-15 15:40:08.000000000 -0800 +++ email.conf 2009-03-31 09:33:08.140625000 -0700 @@ -7,8 +7,8 @@ ############################################################ # SMTP Server and Port number you use ############################################################ -SMTP_SERVER = '127.0.0.1' -SMTP_PORT = '25' +# SMTP_SERVER = '127.0.0.1' +# SMTP_PORT = '25' ############################################################ # If you'd rather use sendmail binary, specify it and the @@ -16,7 +16,7 @@ # this option and SMTP_SERVER set, SMTP_SERVER will be of # higher priority than SENDMAIL. ############################################################ -# SENDMAIL_BIN = '/usr/lib/sendmail -t -i' +SENDMAIL_BIN = '/usr/lib/sendmail -t -i' ############################################################ # Your email address: If you'd like To have your name to @@ -40,7 +40,7 @@ # Signature file and settings: Where is the signature file # You can comment this out if you do not like signatures ############################################################ -SIGNATURE_FILE = '&/email.sig' +# SIGNATURE_FILE = '&/email.sig' ############################################################ # This is where you store your address book... If you don't @@ -114,4 +114,4 @@ # If you have a v-card, you can have it attached to each # message by specifying it's location here. ########################################################### -VCARD = "~/dean.ldif" +# VCARD = '~/example.ldif' --- install.sh.orig 2008-04-07 17:51:26.000000000 -0700 +++ install.sh 2009-03-30 20:22:43.281250000 -0700 @@ -199,16 +199,6 @@ echo "FAILED TO COPY email.conf to $sysconf/email" exit 2 fi - if [ "`uname | cut -b 1-6`" = "CYGWIN" ] - then - if [ -f "generate_config" ] - then - chmod +x "generate_config" - cp generate_config "$bindir/email-config" - chmod 755 "$bindir/email-config" - "$bindir/email-config" "$sysconf/email/email.conf" - fi - fi fi fi if [ ! -f "$sysconf/email/mime.types" ]; then @@ -234,20 +224,20 @@ exit 2 fi -echo "Copying email help documentation to $docdir/email-$VERSION... " -if [ ! -d "$docdir/email-$VERSION" ]; then - mkdir -p "$docdir/email-$VERSION" +echo "Copying email help documentation to $docdir... " +if [ ! -d "$docdir" ]; then + mkdir -p "$docdir" if [ "$?" -ne 0 ] then - echo "FAILED TO MKDIR $docdir/email-$VERSION" + echo "FAILED TO MKDIR $docdir" exit 2 fi fi -cp -f email.1 README ChangeLog THANKS COPYING AUTHORS "$docdir/email-$VERSION" +cp -f email.1 README ChangeLog THANKS COPYING AUTHORS "$docdir" if [ "$?" -ne 0 ] then - echo "FAILED TO COPY documentation to $docdir/email-$VERSION" + echo "FAILED TO COPY documentation to $docdir" exit 2 fi