POSIX fixes for hcachever.sh

diff --git a/ChangeLog b/ChangeLog
index 970d20abdebf577a649e46254beb9aaebb9803ec..2470321a440ce0e4a984dbbd9b510ead7e3a14f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-05 13:06 -0700  Jukka Salmi  <j+mutt@2007.salmi.ch>  (3638701db407)
+
+       * ChangeLog, configure.ac: Check for BDB4 libs in $lib as well as
+       $lib/$ver (fixes pkgsrc BDB4 detection)
+
 2007-04-05 12:55 -0700  Brendan Cully  <brendan@kublai.com>  (4f435337507e)
 
        * Makefile.am, hcache.c, hcachever.sh: Version header cache against

diff --git a/hcachever.sh b/hcachever.sh
index 838b12430293820a5758923a9ea7e9e11801c316..e350e1978dbbbd818f08a526b1fb8bf9dae37115 100755 (executable)
--- a/hcachever.sh
+++ b/hcachever.sh
@@ -2,13 +2,13 @@
 
 BASEVERSION=1
 
-if which md5 > /dev/null
+if test -x "`which md5`"
 then
   MD5=md5
-elif which md5sum > /dev/null
+elif test -x "`which md5sum`"
 then
   MD5=md5sum
-elif which openssl > /dev/null
+elif test -x "`which openssl`"
 then
   MD5="openssl md5 -hex"
 else
@@ -17,11 +17,7 @@ else
 fi
 
 cleanstruct () {
-  STRUCT="$1"
-  STRUCT=${STRUCT#\} }
-  STRUCT=${STRUCT%\;}
-
-  echo $STRUCT
+  echo "$1" | sed -e 's/} *//' -e 's/;$//'
 }
 
 cleanbody () {
@@ -89,8 +85,8 @@ do
        STRUCT=`getstruct "$line"`
        if test -n "$STRUCT"
        then
-         NAME=${STRUCT%%:*}
-         BODY=${STRUCT#*:}
+        NAME=`echo $STRUCT | cut -d: -f1`
+        BODY=`echo $STRUCT | cut -d' ' -f2-`
          echo " * $NAME:" $BODY >> $TMPD
          TEXT="$TEXT $NAME {$BODY}"
        fi
@@ -99,8 +95,8 @@ do
 done
 echo " */" >> $TMPD
 
-MD5TEXT=`echo $TEXT | $MD5`
-echo "#define HCACHEVER 0x"${MD5TEXT:0:8} >> $TMPD
+MD5TEXT=`echo "$TEXT" | $MD5`
+echo "#define HCACHEVER 0x"`echo $MD5TEXT | cut -c-8` >> $TMPD
 
 # TODO: validate we have all structs