Skip to content

Commit d10f136

Browse files
authored
[CI] Fix relocation in NSIS (#6174)
Fix relocation in NSIS
1 parent 50bf312 commit d10f136

1 file changed

Lines changed: 13 additions & 5 deletions

File tree

tools/postinstall-fixup/windows-postinstall-fixup.sh

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,20 @@ clean_default_plugins "$INSTALL_DIR_BIN"
3030
move_metis "$INSTALL_DIR"
3131

3232
# Copy all plugin libs in install/bin (preserving sub-directory structure) to make them easily findable
33-
cd "$INSTALL_DIR"
34-
for p in plugins/*/; do
35-
cd $INSTALL_DIR/$p && find . -name "*.dll" | while read lib; do
36-
cp --parents "$lib" "$INSTALL_DIR"
37-
done
33+
curDir="$INSTALL_DIR"
34+
35+
if [[ "$INSTALL_DIR" == *"/NSIS/"* ]]; then
36+
curDir="$curDir/applications"
37+
fi
38+
cd "$curDir"
39+
40+
for p in plugins/*; do
41+
cd "$curDir/$p" && find . -name "*.dll" | while read lib; do
42+
echo "Moving $lib to $curDir/$lib"
43+
cp --parents "$lib" "$curDir"
3844
done
45+
done
46+
3947

4048
# Copy all plugins config files in etc/ini to make them easily findable
4149
INSTALL_DIR_ETC="$INSTALL_DIR/etc"

0 commit comments

Comments
 (0)