sh scripts: Remove `else' after exit at end of then-block.

Only for simple if-then-else-fi with no elif.

diff --git a/test/rcv/test-rcvstore b/test/rcv/test-rcvstore
index 6337b89..48bf8c1 100755 (executable)
--- a/test/rcv/test-rcvstore
+++ b/test/rcv/test-rcvstore
@@ -183,12 +183,10 @@ if [ "`find ${MH_TEST_DIR}/Mail/test-read-perms -perm 600`"x = ''x ]; then
   if [ ${failed:-0} -eq 0 ]; then
     echo "$Test $0 SKIP (cannot remove read permission on plain files)"
     exit 77
   if [ ${failed:-0} -eq 0 ]; then
     echo "$Test $0 SKIP (cannot remove read permission on plain files)"
     exit 77

-  else
-    exit $failed

   fi
   fi

-else
-  rm -f ${MH_TEST_DIR}/Mail/test-read-perms
+  exit $failed

 fi
 fi

+rm -f ${MH_TEST_DIR}/Mail/test-read-perms

 
 # check default Msg-Protect
 msgprot=`mhparam msgprot`
 
 # check default Msg-Protect
 msgprot=`mhparam msgprot`

diff --git a/uip/mhmail b/uip/mhmail
index 09625af..b94886f 100755 (executable)
--- a/uip/mhmail
+++ b/uip/mhmail
@@ -299,10 +299,9 @@ else
 
   if "$post_or_send" $postsendargs "$tmpfile"; then
     exit
 
   if "$post_or_send" $postsendargs "$tmpfile"; then
     exit

-  else
-    status=$?
-    mv -f "$tmpfile" dead.letter
-    printf 'Letter saved in dead.letter\n' >&2
-    exit $status

   fi
   fi

+  status=$?
+  mv -f "$tmpfile" dead.letter
+  printf 'Letter saved in dead.letter\n' >&2
+  exit $status

 fi
 fi