Skip to content

Fix #11989: Remove dependency on find #12167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 28, 2021
Merged

Fix #11989: Remove dependency on find #12167

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8acab6f
Fix #11989: Remove dependency on find
liufengyun Apr 21, 2021
1238c22
Fix #11989: alternative fix without using ls
liufengyun Apr 21, 2021
1f77685
Address review
liufengyun Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions dist/bin/common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,18 @@ fi
# *-------------------------------------------------*/

find_lib () {
local lib=$(find $PROG_HOME/lib/ -name "$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 [[ -f "$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*")
Expand Down