fix order of sed commands

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Author: scpeters

source-repo-scripts/set_explicit_find_package_versions.bash

@@ -240,14 +240,6 @@ for pkg_xml in ${TEMP_DIR}/src/*/package.xml; do
     find ${TEMP_DIR}/src/*/${cmake_txt_path} -type f -print0 | xargs -0 \
         sed -i "s@\(gz_find_package\s*(\s*${PACKAGE}.*\)\sVERSION@\1@"
     # * Add "VERSION ${MAJOR_VERSION}" just after the ${PACKAGE} name to be found
-    #   when the package name is at the end of line.
-    #   For example, the following line:
-    #       gz_find_package(gz-math
-    #   is replaced with
-    #       gz_find_package(gz-math VERSION 9
-    find ${TEMP_DIR}/src/*/${cmake_txt_path} -type f -print0 | xargs -0 \
-        sed -i "s@\(gz_find_package\s*(\s*${PACKAGE}\)\$@\1 VERSION ${MAJOR_VERSION}@"
-    # * Add "VERSION ${MAJOR_VERSION}" just after the ${PACKAGE} name to be found
     #   when there is whitespace or ')' after the package name.
     #   For example, the following lines:
     #       gz_find_package(gz-math)
@@ -257,6 +249,14 @@ for pkg_xml in ${TEMP_DIR}/src/*/package.xml; do
     #       gz_find_package(gz-math VERSION 9 REQUIRED)
     find ${TEMP_DIR}/src/*/${cmake_txt_path} -type f -print0 | xargs -0 \
         sed -i "s@\(gz_find_package\s*(\s*${PACKAGE}\)\([ )]\)@\1 VERSION ${MAJOR_VERSION}\2@"
+    # * Add "VERSION ${MAJOR_VERSION}" just after the ${PACKAGE} name to be found
+    #   when the package name is at the end of line. This must be done last.
+    #   For example, the following line:
+    #       gz_find_package(gz-math
+    #   is replaced with
+    #       gz_find_package(gz-math VERSION 9
+    find ${TEMP_DIR}/src/*/${cmake_txt_path} -type f -print0 | xargs -0 \
+        sed -i "s@\(gz_find_package\s*(\s*${PACKAGE}\)\$@\1 VERSION ${MAJOR_VERSION}@"
 
     # For find_package calls:
     # * If it has a string containing digits and '.' right after the package name
@@ -269,14 +269,6 @@ for pkg_xml in ${TEMP_DIR}/src/*/package.xml; do
     #       find_package(gz-math REQUIRED)
     find ${TEMP_DIR}/src/*/${cmake_txt_path} -type f -print0 | xargs -0 \
         sed -i "s@^\(\s*find_package\s*(\s*${PACKAGE}\)\s\+[0-9\.]\+@\1@"
-    # * Add the major version after the package name to be found when the package
-    #   name is at the end of line.
-    #   For example, the following lines:
-    #       find_package(gz-math
-    #   is replaced with
-    #       find_package(gz-math 9
-    find ${TEMP_DIR}/src/*/${cmake_txt_path} -type f -print0 | xargs -0 \
-        sed -i "s@^\(\s*find_package\s*(\s*${PACKAGE}\)\$@\1 ${MAJOR_VERSION}@"
     # * Add the major version after the package name to be found when there
     #   is whitespace or ')' after the package name.
     #   For example, the following lines:
@@ -287,6 +279,14 @@ for pkg_xml in ${TEMP_DIR}/src/*/package.xml; do
     #       find_package(gz-math 9 REQUIRED)
     find ${TEMP_DIR}/src/*/${cmake_txt_path} -type f -print0 | xargs -0 \
         sed -i "s@^\(\s*find_package\s*(\s*${PACKAGE}\)\([ )]\)@\1 ${MAJOR_VERSION}\2@"
+    # * Add the major version after the package name to be found when the package
+    #   name is at the end of line. This must be done last.
+    #   For example, the following lines:
+    #       find_package(gz-math
+    #   is replaced with
+    #       find_package(gz-math 9
+    find ${TEMP_DIR}/src/*/${cmake_txt_path} -type f -print0 | xargs -0 \
+        sed -i "s@^\(\s*find_package\s*(\s*${PACKAGE}\)\$@\1 ${MAJOR_VERSION}@"
   done
   popd > /dev/null
 done