Skip to content

Commit 312c2c9

Browse files
committed
Try and use original linux launch script, which calls real AppRun (renamed AppRun.64)
1 parent cfeb0cc commit 312c2c9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

installer/build-server.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ def parse_version_info(version_path):
350350

351351
# Copy .desktop file, replacing Exec= commandline
352352
desk_in = os.path.join(PATH, "xdg", "org.openshot.OpenShot.desktop")
353-
desk_out = os.path.join(app_dir_path, "openshot-qt.desktop")
353+
desk_out = os.path.join(app_dir_path, "org.openshot.OpenShot.desktop")
354354
with open(desk_in, "r") as inf, open(desk_out, "w") as outf:
355355
for line in inf:
356356
if line.startswith("Exec="):
@@ -364,12 +364,12 @@ def parse_version_info(version_path):
364364
desktop_wrapper = os.path.join(app_dir_path, "usr", "bin", "openshot-qt.wrapper")
365365
shutil.copyfile("/home/ubuntu/apps/AppImageKit/desktopintegration", desktop_wrapper)
366366

367-
# Copy encodings folder
368-
#shutil.copytree(os.path.join(app_dir_path, "usr", "bin", "lib", "encodings"),
369-
# os.path.join(app_dir_path, "usr", "bin", "encodings"))
370-
371-
# Create AppRun file
367+
# Create symlink for AppRun (our openshot-qt-launch script)
372368
app_run_path = os.path.join(app_dir_path, "AppRun")
369+
os.symlink(os.path.relpath(launcher_path, app_dir_path), app_run_path)
370+
371+
# Create AppRun.64 file (the real one)
372+
app_run_path = os.path.join(app_dir_path, "AppRun.64")
373373
shutil.copyfile("/home/ubuntu/apps/AppImageKit/AppRun", app_run_path)
374374

375375
# Add execute bit to file mode for AppRun and scripts

installer/launch-linux.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ export QT_PLUGIN_PATH="${HERE}"
1313
export OPENSSL_CONF="/dev/null"
1414

1515
# Launch application
16-
exec "${HERE}"/openshot-qt "$@"
16+
exec "${HERE}"/AppRun.64 "$@"

0 commit comments

Comments
 (0)