Set LANG environment variable when running commands on IPhoneBuilder …

…to fix issue with cocoapods.
codenameone · Apr 21, 2022 · 79a8e37 · 79a8e37
1 parent f010d82
commit 79a8e37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/Executor.java b/maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/Executor.java
@@ -97,6 +97,7 @@ public abstract class Executor {
     private boolean unitTestMode;
     private String platform;
     static boolean IS_MAC;
+    protected final Map<String,String> defaultEnvironment = new HashMap<String,String>();
 
 
 
@@ -1474,6 +1475,7 @@ public String execStringWithThrow(boolean withThrow, File dir, String... varArgs
 
         StringBuilder response = new StringBuilder();
         ProcessBuilder p = new ProcessBuilder(varArgs).directory(dir);
+        p.environment().putAll(defaultEnvironment);
         int val = executeProcess(p, -1, response);
         if (val != 0) {
             if (withThrow) {
@@ -1573,6 +1575,7 @@ public boolean exec(File dir, File javaHome, int timeout, Map<String, String> en
         }
 
         ProcessBuilder p = new ProcessBuilder(varArgs).directory(dir);
+        p.environment().putAll(defaultEnvironment);
         if (env != null) {
             p.environment().putAll(env);
         }

diff --git a/maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/IPhoneBuilder.java b/maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/IPhoneBuilder.java
@@ -209,6 +209,7 @@ private int getDeploymentTargetInt(BuildRequest request) {
 
     @Override
     public boolean build(File sourceZip, BuildRequest request) throws BuildException {
+        defaultEnvironment.put("LANG", "en_US.UTF-8");
         tmpFile = tmpDir = getBuildDirectory();
         useMetal = "true".equals(request.getArg("ios.metal", "false"));
         try {