Commit 51494746 authored by mara's avatar mara

fixed patch check

parent 514d6b00
......@@ -97,7 +97,7 @@ patching_files() {
pf=$(basename "$pf")
[[ -z "$pf" ]] && continue
pushd ${WORK_DIR} 2>&1>/dev/null
[[ ! $(patch -p1 --batch --dry-run -N -i ../${pf}.patch | grep previously) ]] && ( patch -p1 --verbose -i "../${pf}.patch" || return 1 )
[[ ! $(patch -p1 --batch --dry-run -N -i ../${pf}.patch | grep "previously\|already exists") ]] && ( patch -p1 --verbose -i "../${pf}.patch" || return 1 )
popd 2>&1>/dev/null
count=$(($count+1))
done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment