From 53b2c20b8beb7862381a8f8764f836d55e86904c Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Wed, 9 Mar 2022 23:29:37 -0500
Subject: [PATCH] Fix More AppImage Bugs

---
 launcher/CMakeLists.txt                   |  7 +++++++
 launcher/src/bootstrap.c                  | 17 ++++++++++++-----
 launcher/src/bootstrap.h                  |  1 +
 launcher/src/client/launcher.cpp          |  3 +++
 launcher/src/server/launcher.c            |  3 +++
 scripts/generate-appimage-builder-yaml.js |  2 +-
 scripts/install-dependencies.sh           |  3 ++-
 7 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index c55226f95..d6dbe358d 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -14,5 +14,12 @@ if(BUILD_NATIVE_COMPONENTS)
     install_symlink("../${MCPI_INSTALL_DIR}/launcher" "bin/${MCPI_VARIANT_NAME}")
     if(NOT MCPI_SERVER_MODE)
         install(DIRECTORY "client-data/" DESTINATION ".")
+    else()
+        set(ICON_PATH "share/icons/hicolor/scalable/apps")
+        install(
+            FILES "client-data/${ICON_PATH}/com.thebrokenrail.MCPIReborn.png"
+            DESTINATION "${ICON_PATH}"
+            RENAME "com.thebrokenrail.MCPIRebornServer.png"
+        )
     endif()
 endif()
diff --git a/launcher/src/bootstrap.c b/launcher/src/bootstrap.c
index 257eec0bc..0a92fa389 100644
--- a/launcher/src/bootstrap.c
+++ b/launcher/src/bootstrap.c
@@ -139,16 +139,20 @@ static void load(char **ld_preload, char *folder) {
 #define MCPI_BINARY "minecraft-pi"
 #define QEMU_BINARY "qemu-arm"
 
-// Bootstrap
-void bootstrap(int argc, char *argv[]) {
-    INFO("%s", "Configuring Game...");
-
+// Pre-Bootstrap
+void pre_bootstrap() {
     // AppImage
 #ifdef MCPI_IS_APPIMAGE_BUILD
-    if (chdir(getenv("OWD")) != 0) {
+    char *owd = getenv("OWD");
+    if (owd != NULL && chdir(owd) != 0) {
         ERR("AppImage: Unable To Fix Current Directory: %s", strerror(errno));
     }
 #endif
+}
+
+// Bootstrap
+void bootstrap(int argc, char *argv[]) {
+    INFO("%s", "Configuring Game...");
 
     // Get Binary Directory
     char *binary_directory = get_binary_directory();
@@ -156,6 +160,9 @@ void bootstrap(int argc, char *argv[]) {
     // Handle AppImage
 #ifdef MCPI_IS_APPIMAGE_BUILD
     char *usr_prefix = getenv("APPDIR");
+    if (usr_prefix == NULL) {
+        usr_prefix = "";
+    }
 #else
     char *usr_prefix = "";
 #endif
diff --git a/launcher/src/bootstrap.h b/launcher/src/bootstrap.h
index dfc8de352..14c60fc5c 100644
--- a/launcher/src/bootstrap.h
+++ b/launcher/src/bootstrap.h
@@ -6,6 +6,7 @@ extern "C" {
 
 void set_and_print_env(const char *name, char *value);
 
+void pre_bootstrap();
 void bootstrap(int argc, char *argv[]);
 
 #ifdef __cplusplus
diff --git a/launcher/src/client/launcher.cpp b/launcher/src/client/launcher.cpp
index 556b5a7cd..67e7b107f 100644
--- a/launcher/src/client/launcher.cpp
+++ b/launcher/src/client/launcher.cpp
@@ -121,6 +121,9 @@ static void run_zenity_and_set_env(const char *env_name, std::vector<std::string
 
 // Launch
 int main(int argc, char *argv[]) {
+    // Pre-Bootstrap
+    pre_bootstrap();
+
     // Print Features
     for (int i = 1; i < argc; i++) {
         if (strcmp(argv[i], "--print-available-feature-flags") == 0) {
diff --git a/launcher/src/server/launcher.c b/launcher/src/server/launcher.c
index f0cc97810..c739dbc2a 100644
--- a/launcher/src/server/launcher.c
+++ b/launcher/src/server/launcher.c
@@ -4,6 +4,9 @@
 #include "../bootstrap.h"
 
 int main(int argc, char *argv[]) {
+    // Pre-Bootstrap
+    pre_bootstrap();
+
     // Set Home To Current Directory, So World Data Is Stored There
     char *launch_directory = getcwd(NULL, 0);
     set_and_print_env("HOME", launch_directory);
diff --git a/scripts/generate-appimage-builder-yaml.js b/scripts/generate-appimage-builder-yaml.js
index 9c47928f3..c1fc57ea3 100755
--- a/scripts/generate-appimage-builder-yaml.js
+++ b/scripts/generate-appimage-builder-yaml.js
@@ -138,7 +138,7 @@ const appDir = {
     app_info: {
         id: id,
         name: `${name}`,
-        icon: mode === 'client' ? id : 'utilities-terminal',
+        icon: id,
         version: version,
         exec: `usr/bin/${name}`,
         exec_args: '$@'
diff --git a/scripts/install-dependencies.sh b/scripts/install-dependencies.sh
index 8b66516b8..4e04f245a 100755
--- a/scripts/install-dependencies.sh
+++ b/scripts/install-dependencies.sh
@@ -74,7 +74,7 @@ if [ ! -z "${ARM_PACKAGES_SUPPORTED}" ]; then
         libxext-dev:armhf libxext-dev:arm64
 fi
 
-# Install appimagetool Dependencies
+# Install appimagetool & appimage-builder Dependencies
 queue_pkg \
     python3-pip \
     python3-setuptools \
@@ -84,6 +84,7 @@ queue_pkg \
     fakeroot \
     strace \
     fuse \
+    gtk-update-icon-cache \
     sed
 
 # Install Queue