gamer4life1/minecraft-pi-docker
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Issues Pull Requests Releases Wiki Activity

Fix Stupid Mistake

Browse Source
This commit is contained in:
TheBrokenRail 2022-05-15 15:16:45 -04:00
parent cf1faf4835
commit 36c4ed7e4d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
launcher/src/patchelf.c
View File

@ -107,7 +107,6 @@ void patch_mcpi_elf_dependencies(const char *linker) {
char *exit_status_line = NULL; char *exit_status_line = NULL;
get_exit_status_string(return_code, &exit_status_line); get_exit_status_string(return_code, &exit_status_line);
ERR("patchelf Failed%s", exit_status_line); ERR("patchelf Failed%s", exit_status_line);
free(exit_status_line);
} }
// Fix Permissions // Fix Permissions
@ -125,7 +124,13 @@ char *patch_get_interpreter(const char *file) {
file, file,
NULL 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) { if (output != NULL) {
// Trim // Trim
int length = strlen(output); int length = strlen(output);

2
scripts/tools/generate-appimage-builder-yaml.js
View File

@ -118,7 +118,7 @@ const runtime = {
GTK_THEME: 'Default', GTK_THEME: 'Default',
XDG_DATA_DIRS: '${APPDIR}/share:${APPDIR}/usr/share:/share:/usr/share', 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_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, } : undefined,
preserve: arch !== 'armhf' ? [ preserve: arch !== 'armhf' ? [
// On non-ARM32 systems, an ARM32 linker is embedded, this // On non-ARM32 systems, an ARM32 linker is embedded, this