diff --git a/launcher/src/patchelf.c b/launcher/src/patchelf.c index b60265c1..d770b9d4 100644 --- a/launcher/src/patchelf.c +++ b/launcher/src/patchelf.c @@ -107,7 +107,6 @@ void patch_mcpi_elf_dependencies(const char *linker) { char *exit_status_line = NULL; get_exit_status_string(return_code, &exit_status_line); ERR("patchelf Failed%s", exit_status_line); - free(exit_status_line); } // Fix Permissions @@ -125,7 +124,13 @@ char *patch_get_interpreter(const char *file) { file, NULL }; - char *output = run_command(command, NULL); + int return_code; + char *output = run_command(command, &return_code); + if (!is_exit_status_success(return_code)) { + char *exit_status_line = NULL; + get_exit_status_string(return_code, &exit_status_line); + ERR("patchelf Failed%s", exit_status_line); + } if (output != NULL) { // Trim int length = strlen(output); diff --git a/scripts/tools/generate-appimage-builder-yaml.js b/scripts/tools/generate-appimage-builder-yaml.js index 2e256832..d74a150c 100755 --- a/scripts/tools/generate-appimage-builder-yaml.js +++ b/scripts/tools/generate-appimage-builder-yaml.js @@ -118,7 +118,7 @@ const runtime = { GTK_THEME: 'Default', XDG_DATA_DIRS: '${APPDIR}/share:${APPDIR}/usr/share:/share:/usr/share', APPDIR_LIBRARY_PATH: `\${APPDIR}/usr/lib/${triplet}:\${APPDIR}/usr/${triplet}/lib:\${APPDIR}/lib/${triplet}:\${APPDIR}/usr/lib:\${APPDIR}/usr/lib/${triplet}/gdk-pixbuf-2.0/2.10.0/loaders`, - APPDIR_MODULE_DIR: '/tmp/.minecraft-pi-tmp' + APPDIR_MODULE_DIR: '/tmp/.minecraft-pi-patched' } : undefined, preserve: arch !== 'armhf' ? [ // On non-ARM32 systems, an ARM32 linker is embedded, this