From e7a38ea6552d3da9e4ae1c63e7e14a2a9a75c6ae Mon Sep 17 00:00:00 2001
From: Hiroki OTA <hiroki.ota@tier4.jp>
Date: Mon, 7 Feb 2022 20:21:21 +0900
Subject: [PATCH] fix(get-modified-packages): fix a bug with top-level project
 repositories (#61)

* fix: get-modified-packages.sh with less diff

Signed-off-by: h-ohta <hiroki.ota@tier4.jp>

* apply review

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

Co-authored-by: Kenji Miyake <kenji.miyake@tier4.jp>
---
 get-modified-packages/get-modified-packages.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/get-modified-packages/get-modified-packages.sh b/get-modified-packages/get-modified-packages.sh
index 39ad8527..11d279ce 100755
--- a/get-modified-packages/get-modified-packages.sh
+++ b/get-modified-packages/get-modified-packages.sh
@@ -28,13 +28,6 @@ function find_package_dir() {
 
     target_dir=$(dirname "$1")
     while true; do
-        parent_dir=$(dirname "$target_dir")
-
-        # Exit if no parent found
-        if [ "$parent_dir" = "$target_dir" ]; then
-            return 0
-        fi
-
         # Output package name if package.xml found
         if [ -f "$target_dir/package.xml" ]; then
             if [ ! -f "$target_dir/COLCON_IGNORE" ]; then
@@ -43,6 +36,12 @@ function find_package_dir() {
             fi
         fi
 
+        # Exit if no parent found
+        parent_dir=$(dirname "$target_dir")
+        if [ "$parent_dir" = "$target_dir" ]; then
+            return 0
+        fi
+
         # Move to parent dir
         target_dir=$parent_dir
     done