jaromail

commit b373cd5ea8b4ee0a4519d31a5060133cd019b40d
parent e4c9e873d78719cc9e68635acd10273bff5b9302
Author: Jaromil <jaromil@dyne.org>
Date:   Thu, 17 May 2012 19:58:43 +0200

small fixes for osx

Diffstat:
M
build-osx.sh
 | 
9
+++++----
M
install.sh
 | 
8
+++-----
M
src/jaro
 | 
2
+-

3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/build-osx.sh b/build-osx.sh
@@ -15,7 +15,7 @@
 
 # and local natives: fetchmail, procmail...
 
-source src/postino source
+source src/jaro source
 
 mkdir -p build/osx/dylib
 
@@ -60,7 +60,7 @@ copydeps() {
 		# create a wrapper
 		cat <<EOF > build/osx/`basename $1`
 #!/usr/bin/env sh
-PDIR=\$HOME/.postino
+PDIR=\$HOME/Mail/jaro
 DYLD_LIBRARY_PATH=\$PDIR/bin/dylib:\$DYLD_LIBRARY_PATH
 \$PDIR/bin/`basename $1`.bin \$@
 EOF
@@ -68,7 +68,7 @@ EOF
 	fi
 }
 
-notice "Building Postino binary stash for Apple/OSX"
+notice "Building Jaro Mail binary stash for Apple/OSX"
 
 act "lbdb address book module"
 cd aux/lbdb-ABQuery
@@ -80,6 +80,7 @@ copydeps bin/mutt
 copydeps bin/msmtp
 copydeps bin/gpg
 copydeps bin/pinentry
+copydeps bin/lynx
 
-cp src/postino build/osx
+cp src/jaro build/osx
 
diff --git a/install.sh b/install.sh
@@ -208,7 +208,7 @@ MAILDIRS=$MAILDIRS WORKDIR=$WORKDIR src/jaro update
 
 
 case $OS in
-	GNU)
+	GNU|MAC)
 	if [ -r build/osx ]; then
 	    cp -a build/osx/* $WORKDIR/bin
 	fi
@@ -218,13 +218,11 @@ case $OS in
 	    cat <<EOF >> $HOME/.profile
 # Jaro Mail Installer addition on `date`
 export PATH=$WORKDIR/bin:\$PATH
-# Finished adapting your PATH
+# Finished adapting your PATH for Jaro Mail environment
 EOF
 	fi
 	;;
-    MAC)
-		# TODO
-	;;
+	*) ;;
 esac
 	
 notice "Installation completed" #, now edit your personal settings:"
diff --git a/src/jaro b/src/jaro
@@ -71,7 +71,7 @@ case $(uname) in
     Linux) OS=GNU
 	notice "Jaro Mail v$VERSION running on GNU/Linux"	;;
 
-    Apple) OS=MAC
+    Darwin) OS=MAC
 	notice "Jaro Mail v$VERSION running on Mac/OSX"	;;
 
     *) OS=GNU # default