Skip to content

Commit 167dba5

Browse files
MinyazevRiakov
andauthored
Switch to find instead of ls (#1876)
* Switch to find instead of ls * Fix typo * Fix incorrect LD_LIBRARY_PATH * Fix typo * Fix undefined LD_LIBRARY_PATH --------- Co-authored-by: iakov <iakov@users.noreply.github.com>
1 parent 6964a46 commit 167dba5

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

buildScripts/github/install_installer.sh

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,16 @@ prepare_environment_variable_and_check_tools(){
4848
Darwin)
4949
PREFIX="/Applications"
5050
LIB_DIR="$PREFIX/TRIKStudio/TRIK Studio.app/Contents/Lib"
51-
export DYLD_LIBRARY_PATH="$LIB_DIR"
5251
;;
5352
Linux)
5453
ID=$(grep '^ID=' /etc/os-release | cut -d'=' -f2)
5554
if [[ $ID = ubuntu ]]; then PREFIX="$HOME"; else PREFIX="/opt"; fi
56-
LIB_DIR="$PREFIX/TRIKStudio/lib"
57-
export LD_LIBRARY_PATH="$LIB_DIR"
55+
LIB_DIR="$PREFIX/TRIKStudio/lib"
5856
export QT_QPA_PLATFORM=minimal
5957
;;
6058
MINGW64*)
6159
PREFIX="/C"
6260
LIB_DIR="$PREFIX/TRIKStudio"
63-
export LD_LIBRARY_PATH="LIB_DIR"
6461
EXT=".exe"
6562
;;
6663
*) exit 1 ;;
@@ -73,10 +70,10 @@ prepare_environment_variable_and_check_tools(){
7370
TRIK_STUDIO_NAME=$(find "$APP_DIR" -name "trik-studio$EXT" -print -quit)
7471
MAINTENANCE=$(find "$APP_DIR" -name "maintenance$EXT" -print -quit)
7572

76-
"$TWOD_EXEC_NAME" --version
77-
"$PATCHER_NAME" --version
78-
"$TRIK_STUDIO_NAME" --version
79-
"$MAINTENANCE" --version
73+
env DYLD_LIBRARY_PATH="$LIB_DIR" LD_LIBRARY_PATH="$LIB_DIR" "$TWOD_EXEC_NAME" --version
74+
env DYLD_LIBRARY_PATH="$LIB_DIR" LD_LIBRARY_PATH="$LIB_DIR" "$PATCHER_NAME" --version
75+
env DYLD_LIBRARY_PATH="$LIB_DIR" LD_LIBRARY_PATH="$LIB_DIR" "$TRIK_STUDIO_NAME" --version
76+
env DYLD_LIBRARY_PATH="$LIB_DIR" LD_LIBRARY_PATH="$LIB_DIR" "$MAINTENANCE" --version
8077

8178
echo "TWOD_EXEC_NAME=$TWOD_EXEC_NAME" >> $GITHUB_ENV
8279
echo "PATCHER_NAME=$PATCHER_NAME" >> $GITHUB_ENV
@@ -86,24 +83,26 @@ prepare_environment_variable_and_check_tools(){
8683

8784
dll_search(){
8885
cd "$LIB_DIR"
86+
ls -l1
8987
case "$(uname)" in
9088
Darwin)
91-
ls -- *.dylib | xargs otool -L | grep "not found" || exit 0
89+
find . -name '*.dylib*' -print0 | xargs -0 -n1 env DYLD_LIBRARY_PATH="$LIB_DIR" otool -L | grep "not found" || exit 0
9290
;;
9391
Linux)
9492
# Find dependencies that have not been packaged, but are still in the system
95-
ls -- *.so* | xargs ldd | grep -Ev "not found$" | grep so | sed -e '/^[^\t]/ d' | sed -e 's/\t//' \
93+
find . -name '*.so*' -print0 | xargs -0 -n1 env LD_LIBRARY_PATH="$LIB_DIR" ldd | grep -Ev "not found$" | grep so | sed -e '/^[^\t]/ d' | sed -e 's/\t//' \
9694
| sed -e 's/.*=..//' | sed -e 's/ (0.*)//' | grep -Ev "lib(c|dl|m|pthread|rt)\.so.*" \
97-
| grep -Ev "$LD_LIBRARY_PATH" | grep -Ev "ld|linux-vdso"
98-
ls -- *.so* | xargs ldd | grep "not found" || exit 0
95+
| grep -Ev "$LIB_DIR" | grep -Ev "ld|linux-vdso"
96+
97+
find . -name '*.so*' -print0 | xargs -0 -n1 env LD_LIBRARY_PATH="$LIB_DIR" ldd | grep "not found" || exit 0
9998
;;
10099
MINGW64*)
101100
# Find dependencies that have not been packaged, but are still in the system
102-
ls -- *.dll* | xargs ldd | grep -Ev "not found$" | grep dll | sed -e '/^[^\t]/ d' | sed -e 's/\t//' \
101+
find . -name '*.dll*' -print0 | xargs -0 -n1 env LD_LIBRARY_PATH="$LIB_DIR" ldd | grep -Ev "not found$" | grep dll | sed -e '/^[^\t]/ d' | sed -e 's/\t//' \
103102
| sed -e 's/.*=..//' | sed -e 's/ (0.*)//' | grep -Ev "lib(System|SYSTEM)32.*dll" \
104-
| grep -Ev "$LD_LIBRARY_PATH"
103+
| grep -Ev "$LIB_DIR"
105104

106-
ls -- *.dll* | xargs ldd | grep "not found" || exit 0
105+
find . -name '*.dll*' -print0 | xargs -0 -n1 env LD_LIBRARY_PATH="$LIB_DIR" ldd | grep "not found" || exit 0
107106
;;
108107
*) exit 1 ;;
109108
esac

0 commit comments

Comments
 (0)