[arch-commits] CVS update of arch/build/base/vi (3 files)

Tobias Kieslich tobias at archlinux.org
Sun Aug 12 16:52:04 EDT 2007


    Date: Sunday, August 12, 2007 @ 16:52:04
  Author: tobias
    Path: /home/cvs-arch/arch/build/base/vi

Modified: PKGBUILD (1.5 -> 1.6) fetch_patches.sh (1.2 -> 1.3)
          fetch_runtime.sh (1.2 -> 1.3)

fix the helper scripts to run in makepkg -l as well


------------------+
 PKGBUILD         |    6 +++---
 fetch_patches.sh |    3 +--
 fetch_runtime.sh |   15 +++++----------
 3 files changed, 9 insertions(+), 15 deletions(-)


Index: arch/build/base/vi/PKGBUILD
diff -u arch/build/base/vi/PKGBUILD:1.5 arch/build/base/vi/PKGBUILD:1.6
--- arch/build/base/vi/PKGBUILD:1.5	Sun Aug 12 14:17:55 2007
+++ arch/build/base/vi/PKGBUILD	Sun Aug 12 16:52:03 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.5 2007/08/12 18:17:55 jgc Exp $
+# $Id: PKGBUILD,v 1.6 2007/08/12 20:52:03 tobias Exp $
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=vi
@@ -22,8 +22,8 @@
 md5sums=('44c6b4914f38d6f9aa959640b89da329'
          '605cc7ae31bcc9d7864bb0bb6025f55d'
          '144aa049ba70621acf4247f0459f3ee7'
-         'fd7aa27ca214a86eccefb414c2e0d172'
-         '136c1296c9fa91bfe4220637d8cabb11')
+         'a79d5812709f8ffab2898b51345f035d'
+         'ac1c3a474661ac615175417b55e0d6ad')
 
 build()
 {
Index: arch/build/base/vi/fetch_patches.sh
diff -u arch/build/base/vi/fetch_patches.sh:1.2 arch/build/base/vi/fetch_patches.sh:1.3
--- arch/build/base/vi/fetch_patches.sh:1.2	Wed Aug  1 15:43:04 2007
+++ arch/build/base/vi/fetch_patches.sh	Sun Aug 12 16:52:04 2007
@@ -37,8 +37,7 @@
       fi
     fi
 
-    echo "${_md5}  ${_file}" | md5sum -c - >/dev/null 2>&1
-    if [ ${?} -ne 0 ]; then
+    if [ $(echo "${_md5}  ${_file}" | md5sum --status -c -) ]; then
       echo ${_file} md5sums do not match
       return 1
     fi
Index: arch/build/base/vi/fetch_runtime.sh
diff -u arch/build/base/vi/fetch_runtime.sh:1.2 arch/build/base/vi/fetch_runtime.sh:1.3
--- arch/build/base/vi/fetch_runtime.sh:1.2	Mon Jul  9 20:33:09 2007
+++ arch/build/base/vi/fetch_runtime.sh	Sun Aug 12 16:52:04 2007
@@ -42,9 +42,8 @@
     _havefile=0
     # if we have the file and the MD5sum fails, we technically don't have the file
     if [ -f ${_file} ]; then
-      echo "${_md5}  ${_file}" | md5sum -c - >/dev/null 2>&1
       # MD5 fails ? ... we don't have the file
-      if [ ${?} -ne 0 ]; then
+      if [ $(echo "${_md5}  ${_file}" | md5sum --status -c -) ]; then
         rm ${_file}
       else
         _havefile=1
@@ -53,13 +52,11 @@
     # look files that were not copied from the unzipped sources
     _cachefile=${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")/runtime/${_file}
     if [ ${_havefile} -ne 1 -a -f ${_cachefile} ]; then
-      echo "${_md5}  ${_cachefile}" | md5sum -c - >/dev/null 2>&1
       # MD5 fails ? ... we lookup if we downloaded another version earlier
-      if [ ${?} -ne 0 ]; then
+      if [ $(echo "${_md5}  ${_cachefile}" | md5sum --status -c -) ]; then
         _cachefile=${_srccache}/${_file}
         if [ -f ${_cachefile} ]; then
-          echo "${_md5}  ${_cachefile}" | md5sum -c - >/dev/null 2>&1
-          if [ ${?} -ne 0 ]; then
+          if [ $(echo "${_md5}  ${_cachefile}" | md5sum --status -c -) ]; then
             rm ${_cachefile}
           else
             cp ${_cachefile} ${_dir}
@@ -74,9 +71,8 @@
     # look up the local $SRCDEST
     _cachefile=${_srccache}/${_file}
     if [ ${_havefile} -ne 1 -a -f ${_cachefile} ]; then
-      echo "${_md5}  ${_cachefile}" | md5sum -c - >/dev/null 2>&1
       # MD5 fails ? ... we don't have the file
-      if [ ${?} -ne 0 ]; then
+      if [ $(echo "${_md5}  ${_cachefile}" | md5sum --status -c -) ]; then
         rm ${_cachefile}
       else
         cp ${_cachefile} ${_dir}
@@ -96,8 +92,7 @@
     fi
 
    # check the MD5 sum finally
-    echo "${_md5}  ${_file}" | md5sum -c - >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
+    if [ $(echo "${_md5}  ${_file}" | md5sum --status -c -) ]; then
       echo "!!!! md5sum check for ${_file} failed !!!!"
       errors=$((${_errors} + 1))
     fi




More information about the arch-commits mailing list