Merge "[odl/noha] Simplify net scheme on compute nodes"

[fuel.git] / mcp / patches / patch.sh

diff --git a/mcp/patches/patch.sh b/mcp/patches/patch.sh
index ca5c141..bb48dcd 100755 (executable)
--- a/mcp/patches/patch.sh
+++ b/mcp/patches/patch.sh
@@ -11,10 +11,9 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
 
 if [ -r "$1" ]; then
   while IFS=': ' read -r p_dest p_file; do
-    if [[ ! "${p_dest}" =~ '^#' ]] && [[ "${p_dest}" =~ $2 ]] && \
-      ! patch --dry-run -Rd "${p_dest}" -r - -s -p1 < \
-        "/root/fuel/mcp/patches/${p_file}" > /dev/null; then
-          patch -fd "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}"
+    if ! patch --dry-run -Rd "${p_dest}" -r - -s -p1 < \
+      "/root/fuel/mcp/patches/${p_file}" > /dev/null; then
+        patch -d "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}"
     fi
-  done < "$1"
+  done < <(grep -vE '^#' "${1}" | grep -E "^.*${2}.*: ")
 fi