Use Launcher_ENVName for launcher environment variable names (#5226)

.github/actions/package/linux/action.yml

@@ -91,7 +91,7 @@ runs:
         find "$INSTALL_APPIMAGE_DIR" -name '*gamemode*' -exec rm {} +
 
         #disable OpenGL and Vulkan launcher features until https://github.com/VHSgunzo/sharun/issues/35
-        echo "LAUNCHER_DISABLE_GLVULKAN=1" > "$INSTALL_APPIMAGE_DIR"/.env
+        echo "PRISMLAUNCHER_DISABLE_GLVULKAN=1" > "$INSTALL_APPIMAGE_DIR"/.env
         #makes the launcher use portals for file picking
         echo "QT_QPA_PLATFORMTHEME=xdgdesktopportal" > "$INSTALL_APPIMAGE_DIR"/.env
         ln -s org.prismlauncher.PrismLauncher.metainfo.xml "$INSTALL_APPIMAGE_DIR"/share/metainfo/org.prismlauncher.PrismLauncher.appdata.xml

buildconfig/BuildConfig.cpp.in

@@ -50,6 +50,7 @@ Config::Config()
     LAUNCHER_GIT = "@Launcher_Git@";
     LAUNCHER_APPID = "@Launcher_AppID@";
     LAUNCHER_SVGFILENAME = "@Launcher_SVGFileName@";
+    LAUNCHER_ENVNAME = "@Launcher_ENVName@";
 
     USER_AGENT = "@Launcher_UserAgent@";
 

buildconfig/BuildConfig.h

@@ -54,6 +54,7 @@ class Config {
     QString LAUNCHER_GIT;
     QString LAUNCHER_APPID;
     QString LAUNCHER_SVGFILENAME;
+    QString LAUNCHER_ENVNAME;
 
     /// The major version number.
     int VERSION_MAJOR;

launcher/HardwareInfo.cpp

@@ -22,6 +22,7 @@
 #include <QOffscreenSurface>
 #include <QOpenGLFunctions>
 #include <QProcessEnvironment>
+#include "BuildConfig.h"
 
 #ifndef Q_OS_MACOS
 #include <QVulkanInstance>
@@ -31,7 +32,9 @@
 namespace {
 bool vulkanInfo(QStringList& out)
 {
-    if (!QProcessEnvironment::systemEnvironment().value(QStringLiteral("LAUNCHER_DISABLE_GLVULKAN")).isEmpty()) {
+    if (!QProcessEnvironment::systemEnvironment()
+             .value(QStringLiteral("%1_DISABLE_GLVULKAN").arg(BuildConfig.LAUNCHER_ENVNAME))
+             .isEmpty()) {
         return false;
     }
 #ifndef Q_OS_MACOS
@@ -57,7 +60,9 @@ bool vulkanInfo(QStringList& out)
 
 bool openGlInfo(QStringList& out)
 {
-    if (!QProcessEnvironment::systemEnvironment().value(QStringLiteral("LAUNCHER_DISABLE_GLVULKAN")).isEmpty()) {
+    if (!QProcessEnvironment::systemEnvironment()
+             .value(QStringLiteral("%1_DISABLE_GLVULKAN").arg(BuildConfig.LAUNCHER_ENVNAME))
+             .isEmpty()) {
         return false;
     }
     QOpenGLContext ctx;

launcher/Launcher.in

@@ -15,6 +15,7 @@ fi
 
 
 LAUNCHER_NAME=@Launcher_APP_BINARY_NAME@
+LAUNCHER_ENVNAME=@Launcher_ENVName@
 LAUNCHER_DIR="$(dirname "$(readlink -f "$0")")"
 echo "Launcher Dir: ${LAUNCHER_DIR}"
 
@@ -23,7 +24,7 @@ export QT_QPA_PLATFORMTHEME=xdgdesktopportal
 
 # disable OpenGL and Vulkan launcher features on sharun until https://github.com/VHSgunzo/sharun/issues/35
 if [[ -f "${LAUNCHER_DIR}/sharun" ]]; then
-    export LAUNCHER_DISABLE_GLVULKAN=1
+    export ${LAUNCHER_ENVNAME}_DISABLE_GLVULKAN=1
 fi
 
 # Just to be sure...

launcher/java/JavaUtils.cpp

@@ -42,6 +42,7 @@
 
 #include <QDebug>
 #include "Application.h"
+#include "BuildConfig.h"
 #include "FileSystem.h"
 #include "java/JavaInstallList.h"
 #include "java/JavaUtils.h"
@@ -155,7 +156,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava()
 
 QStringList addJavasFromEnv(QList<QString> javas)
 {
-    auto env = qEnvironmentVariable("PRISMLAUNCHER_JAVA_PATHS");  // FIXME: use launcher name from buildconfig
+    auto env = QProcessEnvironment::systemEnvironment().value(QStringLiteral("%1_JAVA_PATHS").arg(BuildConfig.LAUNCHER_ENVNAME));
 #if defined(Q_OS_WIN32)
     QList<QString> javaPaths = env.replace("\\", "/").split(QLatin1String(";"));
 

launcher/ui/dialogs/skins/draw/SkinOpenGLWindow.cpp

@@ -26,6 +26,7 @@
 #include <QtMath>
 #include <functional>
 
+#include "BuildConfig.h"
 #include "minecraft/skins/SkinModel.h"
 #include "rainbow.h"
 #include "ui/dialogs/skins/draw/BoxGeometry.h"
@@ -331,7 +332,9 @@ void SkinOpenGLWindow::setElytraVisible(bool visible)
 
 bool SkinOpenGLWindow::hasOpenGL()
 {
-    if (!QProcessEnvironment::systemEnvironment().value(QStringLiteral("LAUNCHER_DISABLE_GLVULKAN")).isEmpty()) {
+    if (!QProcessEnvironment::systemEnvironment()
+             .value(QStringLiteral("%1_DISABLE_GLVULKAN").arg(BuildConfig.LAUNCHER_ENVNAME))
+             .isEmpty()) {
         return false;
     }
 

program_info/CMakeLists.txt

@@ -16,6 +16,7 @@ set(Launcher_Git "https://github.com/PrismLauncher/PrismLauncher")
 
 set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
 set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
+set(Launcher_ENVName "PRISMLAUNCHER" PARENT_SCOPE)
 set(Launcher_Domain "${Launcher_Domain}" PARENT_SCOPE)
 set(Launcher_Git "${Launcher_Git}" PARENT_SCOPE)