diff options
author | Leah Neukirchen <leah@vuxu.org> | 2023-12-02 19:13:16 +0100 |
---|---|---|
committer | Leah Neukirchen <leah@vuxu.org> | 2023-12-02 19:13:20 +0100 |
commit | 94d1bc949192f819ffaab475c488068628dceade (patch) | |
tree | 797e2f9c9b60a717c9d8611e011f5ba24648e3f0 | |
parent | 623df4fe22669cb2bf83e8688fad9813fab9c442 (diff) | |
download | xtools-94d1bc949192f819ffaab475c488068628dceade.tar.gz xtools-94d1bc949192f819ffaab475c488068628dceade.tar.xz xtools-94d1bc949192f819ffaab475c488068628dceade.zip |
xbump: use fgrep on spkpattern
Fixes #318.
-rwxr-xr-x | xbump | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xbump b/xbump index 3e40f84..3dab39b 100755 --- a/xbump +++ b/xbump @@ -12,11 +12,11 @@ if [ -z "$version" ]; then exit 1 fi -spkpattern=$(xsubpkg "$pkg" | tr '\n' '|' | sed 's/\(.*\)|/^(\1)$/') +spkpattern=$(xsubpkg "$pkg") shlibs=$(git diff common/shlibs | grep "^+[^+]" | \ sed "s/^+[^ ]\+ \(.*\)-[^-]\+_[0-9]\+$/\1/") -if [ -n "$(echo "$shlibs" | grep -vE "$spkpattern")" ]; then - echo "common/shlibs contains uncommitted changes for other packages." >&2 +if [ -n "$(echo "$shlibs" | grep -vFx "$spkpattern")" ]; then + echo "common/shlibs contains uncommitted changes for other packages." 2>&1 exit 1 elif [ -n "$shlibs" ]; then git add common/shlibs |