From a9cd7fa56b0315409cdc3a3f42cb0fe829d9c799 Mon Sep 17 00:00:00 2001
From: James Crean <creanjames@gmail.com>
Date: Thu, 19 Apr 2018 17:40:25 -0700
Subject: [PATCH] Removes automatic fix for LD_PRELOAD. This was causing issues
 for server deploys (#287)

---
 frontend/package-lock.json | 10 +++++++---
 scripts/vcdat              | 12 ------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 0bb5f1e..0900937 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -14420,11 +14420,15 @@
       }
     },
     "vcs-widgets": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/vcs-widgets/-/vcs-widgets-0.1.0.tgz",
-      "integrity": "sha512-kC5iTlotO7s2XVRwEFxTaY6hmMhZDBauOEWozxphshlxInHtGU7oa1gwyQt+zcy00jQmAcL82YcWIVfEuqFdmQ==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/vcs-widgets/-/vcs-widgets-0.1.3.tgz",
+      "integrity": "sha512-KGjvlC6zJeOCSdnDmmeBGUUNlYqWzBAd52Sj/x5egZiCacP00a8oYR4e8Cy0++UuDC+LYFAsBcivQkWLOT63cw==",
       "requires": {
+        "jquery": "3.3.1",
         "npm": "5.8.0",
+        "react": "16.3.1",
+        "react-bootstrap": "0.32.1",
+        "react-dom": "16.3.1",
         "user": "0.0.0"
       }
     },
diff --git a/scripts/vcdat b/scripts/vcdat
index 2eafbf8..bb884be 100755
--- a/scripts/vcdat
+++ b/scripts/vcdat
@@ -49,18 +49,6 @@ if(args.print_log):
 
 print "Logs are going to:", logfile.name
 
-try:
-    logfile.write("\nTesting VCS\n")
-    logfile.flush()
-    subprocess.check_output("python -c 'import vcs; x=vcs.init(); x.open()'", shell=True, stderr=logfile)
-except subprocess.CalledProcessError:
-    logfile.write("\nVCS failed to start. Attempting to fix LD_PRELOAD path...\n")
-    logfile.flush()
-    if('LD_PRELOAD' in os.environ.keys()):
-        logfile.write("LD_PRELOAD was: '{}'\n".format(os.environ['LD_PRELOAD']))
-        logfile.flush()
-    os.environ['LD_PRELOAD'] = "/usr/lib/x86_64-linux-gnu/libstdc++.so.6"
-
 print "Starting VCSJS on PORT:", VCSJS_PORT
 vcs_server = subprocess.Popen(
     ["vcs-server", "--port", VCSJS_PORT], stdout=logfile, stderr=logfile)