From cd7272d00af3f9eb8c524bdbe910dbc44f8dbed8 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 25 Apr 2024 14:15:44 +0200
Subject: [PATCH] Fix environment variable generation in
 ApplicationDeploymentJob.php

---
 app/Jobs/ApplicationDeploymentJob.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index db64b6542..3d04be7d3 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -718,10 +718,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 if ($env->version === '4.0.0-beta.239') {
                     $real_value = $env->real_value;
                 } else {
-                    $real_value = escapeEnvVariables($env->real_value);
-                }
-                if ($env->is_literal) {
-                    $real_value = '\'' . $real_value . '\'';
+                    if ($env->is_literal) {
+                        $real_value = '\'' . $real_value . '\'';
+                    } else {
+                        $real_value = escapeEnvVariables($env->real_value);
+                    }
                 }
                 $envs->push($env->key . '=' . $real_value);
             }
@@ -755,8 +756,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     } else {
                         $real_value = escapeEnvVariables($env->real_value);
                     }
-                    $envs->push($env->key . '=' . $real_value);
                 }
+                $envs->push($env->key . '=' . $real_value);
             }
             // Add PORT if not exists, use the first port as default
             if ($this->application->environment_variables->filter(fn ($env) => Str::of($env)->startsWith('PORT'))->isEmpty()) {