From 74ee75e12fbf305a30de974eff7a5db2389c4a43 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sat, 15 Jun 2024 10:19:18 -0400 Subject: [PATCH] Some Fixes --- .gitea/workflows/build.yml | 6 +++--- dependencies/symbol-processor/src | 2 +- launcher/src/client/configuration.cpp | 3 ++- scripts/install-dependencies.sh | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 45362623..54224a87 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -58,7 +58,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 with: - submodules: true + submodules: false # Dependencies - name: Install Dependencies run: ./scripts/install-dependencies.sh test ${{ matrix.arch }} @@ -81,7 +81,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 with: - submodules: true + submodules: false # Dependencies - name: Install Dependencies run: ./scripts/install-dependencies.sh example_mods amd64 @@ -95,7 +95,7 @@ jobs: run: | ./scripts/fix-appimage-for-docker.sh ./out/*.AppImage chmod +x ./out/*.AppImage - ./out/*.AppImage --copy-sdk + ./out/*.AppImage --appimage-extract-and-run --copy-sdk # Build Example Mods - name: Build Example Mods run: ./example-mods/build.sh diff --git a/dependencies/symbol-processor/src b/dependencies/symbol-processor/src index 8249a305..6098f57b 160000 --- a/dependencies/symbol-processor/src +++ b/dependencies/symbol-processor/src @@ -1 +1 @@ -Subproject commit 8249a305df07a0b087b44341afa8c3b27ad7a156 +Subproject commit 6098f57b03cae72668c6d2c1624a3a3f01d13fa9 diff --git a/launcher/src/client/configuration.cpp b/launcher/src/client/configuration.cpp index 45c1007c..d40e33b7 100644 --- a/launcher/src/client/configuration.cpp +++ b/launcher/src/client/configuration.cpp @@ -83,6 +83,8 @@ void load_available_feature_flags(const std::function &callba static void run_command_and_set_env(const char *env_name, const char *command[]) { // Only Run If Environmental Variable Is NULL if (getenv(env_name) == nullptr) { + // Check $DISPLAY + reborn_check_display(); // Run int return_code; char *output = run_command(command, &return_code, nullptr); @@ -108,7 +110,6 @@ static void run_command_and_set_env(const char *env_name, const char *command[]) // Use Zenity To Set Environmental Variable #define DIALOG_TITLE "Launcher" static void run_zenity_and_set_env(const char *env_name, std::vector command) { - reborn_check_display(); // Create Full Command std::vector full_command; full_command.push_back("zenity"); diff --git a/scripts/install-dependencies.sh b/scripts/install-dependencies.sh index 3d2fcf11..a8d49713 100755 --- a/scripts/install-dependencies.sh +++ b/scripts/install-dependencies.sh @@ -70,6 +70,7 @@ run_build() { run_test() { sudo apt-get install --no-install-recommends -y \ "libc6:$1" \ + "libstdc++6:$1" \ "libopenal1:$1" \ "libglib2.0-0:$1" }