From 1a30651362ab895bf627cec3f1a78bd60e64eb67 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 11 Mar 2011 21:18:24 +0100 Subject: [PATCH] Abort properly if source files are not under version control (FS#23122). Remove superfluous subshell code from version control checks in commitpkg, making it exit properly if source files are not under version control. Also, improve correctness of sed(1) commands and use fgrep(1) instead of grep(1) where appropriate. Signed-off-by: Lukas Fleischer --- commitpkg | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commitpkg b/commitpkg index ab57a61..f50c607 100755 --- a/commitpkg +++ b/commitpkg @@ -72,23 +72,23 @@ else fi # check if all local source files are under version control -(for s in ${source[@]}; do - echo $s | grep -vq '://' && \ - svn status $s | grep -q '?' && \ +for s in ${source[@]}; do + echo $s | grep -Fvq '://' && \ + svn status $s | grep -q '^\?' && \ abort "$s is not under version control" -done) || true +done # check if changelog and install files are under version control -(for i in 'changelog' 'install'; do +for i in 'changelog' 'install'; do filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD) for file in $filelist; do # evaluate any bash variables used eval file=${file} - if svn status ${file} | grep -q '?'; then + if svn status ${file} | grep -q '^\?'; then abort "${file} is not under version control" fi done -done) || true +done # see if any limit options were passed, we'll send them to rsync unset rsyncopts -- 1.7.4.1