From 786417cf0fdce65ee642b1d126101ab79c72c847 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 14 Feb 2020 16:31:54 +0100
Subject: Revert "Issue #1441 - Guard appomni/greomni with UXP_CUSTOM_OMNI env
 var."

This reverts commit 2bdbca39b210e3f13ae42ccae36935d30b36eb31.
---
 toolkit/xre/nsAppRunner.cpp | 72 +++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 38 deletions(-)

(limited to 'toolkit/xre')

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index d8f95c2a8..b27e46697 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4131,49 +4131,45 @@ XRE_InitCommandLine(int aArgc, char* aArgv[])
   delete[] canonArgs;
 #endif
 
-  if (PR_GetEnv("UXP_CUSTOM_OMNI")) {
-    // Process CLI parameters for specifying custom omnijars
-    const char *path = nullptr;
-    ArgResult ar = CheckArg("greomni", true, &path);
-    if (ar == ARG_BAD) {
-      PR_fprintf(PR_STDERR, 
-                 "Error: argument --greomni requires a path argument or the "
-                 "--osint argument was specified with the --greomni argument "
-                 "which is invalid.\n");
-      return NS_ERROR_FAILURE;
-    }
-
-    if (!path)
-      return rv;
+  const char *path = nullptr;
+  ArgResult ar = CheckArg("greomni", true, &path);
+  if (ar == ARG_BAD) {
+    PR_fprintf(PR_STDERR, 
+               "Error: argument --greomni requires a path argument or the "
+               "--osint argument was specified with the --greomni argument "
+               "which is invalid.\n");
+    return NS_ERROR_FAILURE;
+  }
 
-    nsCOMPtr<nsIFile> greOmni;
-    rv = XRE_GetFileFromPath(path, getter_AddRefs(greOmni));
-    if (NS_FAILED(rv)) {
-      PR_fprintf(PR_STDERR, "Error: argument --greomni requires a valid path\n");
-      return rv;
-    }
+  if (!path)
+    return rv;
 
-    ar = CheckArg("appomni", true, &path);
-    if (ar == ARG_BAD) {
-      PR_fprintf(PR_STDERR,
-                 "Error: argument --appomni requires a path argument or the "
-                 "--osint argument was specified with the --appomni argument "
-                 "which is invalid.\n");
-      return NS_ERROR_FAILURE;
-    }
+  nsCOMPtr<nsIFile> greOmni;
+  rv = XRE_GetFileFromPath(path, getter_AddRefs(greOmni));
+  if (NS_FAILED(rv)) {
+    PR_fprintf(PR_STDERR, "Error: argument --greomni requires a valid path\n");
+    return rv;
+  }
 
-    nsCOMPtr<nsIFile> appOmni;
-    if (path) {
-        rv = XRE_GetFileFromPath(path, getter_AddRefs(appOmni));
-        if (NS_FAILED(rv)) {
-          PR_fprintf(PR_STDERR, "Error: argument --appomni requires a valid path\n");
-          return rv;
-        }
-    }
+  ar = CheckArg("appomni", true, &path);
+  if (ar == ARG_BAD) {
+    PR_fprintf(PR_STDERR,
+               "Error: argument --appomni requires a path argument or the "
+               "--osint argument was specified with the --appomni argument "
+               "which is invalid.\n");
+    return NS_ERROR_FAILURE;
+  }
 
-    mozilla::Omnijar::Init(greOmni, appOmni);
-  } // UXP_CUSTOM_OMNI
+  nsCOMPtr<nsIFile> appOmni;
+  if (path) {
+      rv = XRE_GetFileFromPath(path, getter_AddRefs(appOmni));
+      if (NS_FAILED(rv)) {
+        PR_fprintf(PR_STDERR, "Error: argument --appomni requires a valid path\n");
+        return rv;
+      }
+  }
 
+  mozilla::Omnijar::Init(greOmni, appOmni);
   return rv;
 }
 
-- 
cgit v1.2.3