Skip to content

Commit 804562c

Browse files
committed
Keep all of the share directory when creating standalone installers
There have been two releases now where we have had to add extra things that have been missing because we trim the share folder. We only save 20mb by trimming it down, and the risk is too high to justify that.
1 parent 722b60a commit 804562c

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

installers/conda/common/common.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,7 @@ function trim_conda() {
2727
# We don't use this workbench script in the Linux standalone, so remove it to avoid confusion
2828
rm "$bundle_conda_prefix"/bin/workbench
2929
fi
30-
# Heavily cut down share
31-
mv "$bundle_conda_prefix"/share "$bundle_conda_prefix"/share_tmp
32-
mkdir "$bundle_conda_prefix"/share
33-
mv "$bundle_conda_prefix"/share_tmp/doc "$bundle_conda_prefix"/share/
34-
mkdir -p "$bundle_conda_prefix"/share/glib-2.0/schemas
35-
mv "$bundle_conda_prefix"/share_tmp/glib-2.0/schemas "$bundle_conda_prefix"/share/glib-2.0/
36-
if [ -d "$bundle_conda_prefix"/share_tmp/X11 ]; then
37-
# On some linux flavours we need this on some otherwise workbench won't launch
38-
mv "$bundle_conda_prefix"/share_tmp/X11 "$bundle_conda_prefix"/share/
39-
fi
30+
4031
# Heavily cut down translations
4132
mv "$bundle_conda_prefix"/translations "$bundle_conda_prefix"/translations_tmp
4233
mkdir -p "$bundle_conda_prefix"/translations/qtwebengine_locales
@@ -51,7 +42,6 @@ function trim_conda() {
5142
"$bundle_conda_prefix"/phrasebooks \
5243
"$bundle_conda_prefix"/qml \
5344
"$bundle_conda_prefix"/qsci \
54-
"$bundle_conda_prefix"/share_tmp \
5545
"$bundle_conda_prefix"/translations_tmp
5646

5747
find "$bundle_conda_prefix" -name '*.a' -delete

0 commit comments

Comments
 (0)