Fix replacing ign-fuel-tools branch name with main

Replace branch name before swapping - for _ in DEP_LIB. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
gazebo-tooling · Dec 3, 2021 · efce3f6 · efce3f6
1 parent 7a0f736
commit efce3f6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/release-repo-scripts/bump_dependency.bash b/release-repo-scripts/bump_dependency.bash
@@ -344,14 +344,14 @@ for ((i = 0; i < "${#LIBRARIES[@]}"; i++)); do
 
     find . -type f ! -name 'Changelog.md' ! -name 'Migration.md' -print0 | xargs -0 sed -i "s ${DEP_LIB}${DEP_PREV_VER} ${DEP_LIB}${DEP_VER} g"
 
-    # Second run with _ instead of -, to support multiple variations of fuel-tools
-    DEP_LIB=${DEP_LIB//-/_}
-    find . -type f ! -name 'Changelog.md' ! -name 'Migration.md' -print0 | xargs -0 sed -i "s ${DEP_LIB}${DEP_PREV_VER} ${DEP_LIB}${DEP_VER} g"
-
     # Replace collection yaml branch names with main
     if [[ "${LIB}" == "ign-${COLLECTION}" ]]; then
       find . -type f -name "collection-${COLLECTION}.yaml" -print0 | xargs -0 sed -i "s ign-${DEP_LIB}${DEP_VER} main g"
     fi
+
+    # Second run with _ instead of -, to support multiple variations of fuel-tools
+    DEP_LIB=${DEP_LIB//-/_}
+    find . -type f ! -name 'Changelog.md' ! -name 'Migration.md' -print0 | xargs -0 sed -i "s ${DEP_LIB}${DEP_PREV_VER} ${DEP_LIB}${DEP_VER} g"
   done
 
   commitAndPR ${ORG} main