From 8acab6f1a8c40b6db73fc3e35e40f7fbb3e606d3 Mon Sep 17 00:00:00 2001
From: Liu Fengyun <liu@fengy.me>
Date: Wed, 21 Apr 2021 10:33:02 +0200
Subject: [PATCH 1/3] Fix #11989: Remove dependency on find

---
 dist/bin/common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/bin/common b/dist/bin/common
index fd7b8be9149e..48e738b158ab 100755
--- a/dist/bin/common
+++ b/dist/bin/common
@@ -133,7 +133,7 @@ fi
 # *-------------------------------------------------*/
 
 find_lib () {
-  local lib=$(find $PROG_HOME/lib/ -name "$1")
+  local lib=$(ls $PROG_HOME/lib/$1)
   if [ -n "$CYGPATHCMD" ]; then
     "$CYGPATHCMD" -am $lib
   elif [[ $mingw ||  $msys ]]; then

From 1238c2255c7708df6cf4d8c5c4f4ad3c8b0a3d8c Mon Sep 17 00:00:00 2001
From: Liu Fengyun <liu@fengy.me>
Date: Wed, 21 Apr 2021 10:33:02 +0200
Subject: [PATCH 2/3] Fix #11989: alternative fix  without using ls

Co-authored-by: Tom Grigg <tomegrigg@gmail.com>
---
 dist/bin/common | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/dist/bin/common b/dist/bin/common
index 48e738b158ab..dd56111f8c02 100755
--- a/dist/bin/common
+++ b/dist/bin/common
@@ -133,14 +133,18 @@ fi
 # *-------------------------------------------------*/
 
 find_lib () {
-  local lib=$(ls $PROG_HOME/lib/$1)
-  if [ -n "$CYGPATHCMD" ]; then
-    "$CYGPATHCMD" -am $lib
-  elif [[ $mingw ||  $msys ]]; then
-    echo $lib | sed 's|/|\\\\|g'
-  else
-    echo $lib
-  fi
+  for lib in "$PROG_HOME"/lib/$1 ; do
+    if [[ -e "$lib" ]]; then
+      if [ -n "$CYGPATHCMD" ]; then
+        "$CYGPATHCMD" -am "$lib"
+      elif [[ $mingw ||  $msys ]]; then
+        echo "$lib" | sed 's|/|\\\\|g'
+      else
+        echo "$lib"
+      fi
+      return
+    fi
+  done
 }
 
 DOTTY_COMP=$(find_lib "*scala3-compiler*")

From 1f77685158b7e580ec2ab48cfccbdb77ed9dab03 Mon Sep 17 00:00:00 2001
From: Fengyun Liu <liu@fengy.me>
Date: Wed, 28 Apr 2021 07:47:03 +0200
Subject: [PATCH 3/3] Address review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Stéphane Micheloud <stephane.micheloud@gmail.com>

Co-authored-by: Tom Grigg <tomegrigg@gmail.com>
---
 dist/bin/common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/bin/common b/dist/bin/common
index dd56111f8c02..62fa53c937e8 100755
--- a/dist/bin/common
+++ b/dist/bin/common
@@ -134,7 +134,7 @@ fi
 
 find_lib () {
   for lib in "$PROG_HOME"/lib/$1 ; do
-    if [[ -e "$lib" ]]; then
+    if [[ -f "$lib" ]]; then
       if [ -n "$CYGPATHCMD" ]; then
         "$CYGPATHCMD" -am "$lib"
       elif [[ $mingw ||  $msys ]]; then