jaromail

commit 504df39571712ad0905d135fcf0cdd7408c99ebd
parent 37d4c28b96a5c60a071a5edb25099dc0b759b82b
Author: Jaromil <jaromil@dyne.org>
Date:   Sun, 27 Apr 2014 20:24:24 +0200

small fixes for first time install

Diffstat:
M
build/build-gnu.sh
 | 
2
+-
M
build/install-gnu.sh
 | 
9
++++-----
M
src/jaro
 | 
9
++++++++-
M
src/zlibs/helpers
 | 
2
+-

4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/build/build-gnu.sh b/build/build-gnu.sh
@@ -29,7 +29,7 @@ mkdir -p build/gnu
 	    which msmtp     >/dev/null || deps+=(msmtp)
 	    which mutt      >/dev/null || deps+=(mutt)
 	    which mairix    >/dev/null || deps+=(mairix)
-	    which pinentry  >/dev/null || deps+=(pinentry)
+	    which pinentry  >/dev/null || deps+=(pinentry-curses)
 	    which abook     >/dev/null || deps+=(abook)
 	    which wipe      >/dev/null || deps+=(wipe)
 
diff --git a/build/install-gnu.sh b/build/install-gnu.sh
@@ -15,14 +15,14 @@ mkdir -p $JARO_LIBEXEC
 { test -r doc } && { srcdir=. }
 { test -r install-gnu.sh } && { srcdir=.. }
 
+{ test -r $srcdir/src/fetchdate } || {
+    print "Error: first build, then install."; return 1 }
+
 cp -ra $srcdir/doc/* $JARO_SHARE/
 cp -ra $srcdir/src/procmail $JARO_SHARE/.procmail
 cp -ra $srcdir/src/mutt $JARO_SHARE/.mutt
 cp -ra $srcdir/src/stats $JARO_SHARE/.stats
 
-{ test -r $srcdir/build/gnu/fetchaddr } || {
-    print "Error: first build, then install."; return 1 }
-
 # copy the executables
 cp -ra $srcdir/build/gnu/* $JARO_LIBEXEC/
 cp -ra $srcdir/src/zlibs $JARO_LIBEXEC/
@@ -33,4 +33,4 @@ cat <<EOF > $PREFIX/bin/jaro
 export JAROWORKDIR=${JARO_SHARE}
 ${JARO_SHARE}/jaro \${=@}
 EOF
-chmod +x $PREFIX/bin/jaro-
\ No newline at end of file
+chmod +x $PREFIX/bin/jaro
diff --git a/src/jaro b/src/jaro
@@ -317,7 +317,7 @@ TRAPINT() {
 check_bin() {
 
     # required programs
-    for req in pinentry fetchmail procmail; do
+    for req in pinentry fetchmail procmail gpg; do
 	command -v $req >/dev/null
 	{ test $? != 0 } && {
 	    error "Cannot find $req. Please install it."
@@ -325,6 +325,13 @@ check_bin() {
 	}
     done
 
+    # make sure a gnupg dir exists
+    { test -r $HOME/.gnupg/pubring.gpg } || {                                               
+        mkdir -p $HOME/.gnupg                                                           
+        touch $HOME/.gnupg/pubring.gpg
+        touch $HOME/.gnupg/secring.gpg
+    }
+
     # which find command to use
     case $OS in
 	GNU) find="find -O3" ;;
diff --git a/src/zlibs/helpers b/src/zlibs/helpers
@@ -39,7 +39,7 @@ autostart() {
 
 	{ test ! -r $MUTTDIR/rc } \
 	    && { error "Jaro Mail is not yet configured."
-		 error "To configure, edit plain text config files in the system directory."
+		 error "To configure, edit the files in $MAILDIRS/Accounts"
 		 return 1 }
 
 	${=mutt} -F $MUTTDIR/rc ${=muttflags} -Z