script/postfix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply-sa-compile-utf8-patch.sh: change regexp to determin if the path was previouslyapplied.

Browse Source
This commit is contained in:
Christoph 2019-05-11 12:23:04 +02:00
parent e34a18e335
commit 616e7dae15
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apply-sa-compile-utf8-patch.sh
View File

@ -149,7 +149,7 @@ blank_line
echononl "Apply patch \033[1m$(basename "$patch_file")\033[m to '$orig_file'.." echononl "Apply patch \033[1m$(basename "$patch_file")\033[m to '$orig_file'.."
patch --silent --forward --reject-file - -p0 "$orig_file" "$patch_file" > $log_file patch --silent --forward --reject-file - -p0 "$orig_file" "$patch_file" > $log_file
if [[ $? -gt 0 ]]; then if [[ $? -gt 0 ]]; then
if $(grep -q "Skipping patch" "$log_file" 2> /dev/null) ; then if $(grep -q -E "previously.* applied" "$log_file" 2> /dev/null) ; then
echo_skipped echo_skipped
else else
echo_failed echo_failed