Merge pull request #740 from JunoLab/sp/pkgserver

pkg server setting

Author: pfitzseb

lib/connection/process/basic.js

@@ -26,6 +26,7 @@ export function get_ (path, args) {
 
 export function customEnv (env = process.env) {
   let confnt = atom.config.get('julia-client.juliaOptions.numberOfThreads')
+  let pkgServer = atom.config.get('julia-client.juliaOptions.packageServer')
   let confntInt = parseInt(confnt)
 
   if (confnt == 'auto') {
@@ -34,6 +35,10 @@ export function customEnv (env = process.env) {
     env.JULIA_NUM_THREADS = confntInt
   }
 
+  if (pkgServer) {
+    env.JULIA_PKG_SERVER = pkgServer
+  }
+
   if (atom.config.get('julia-client.disableProxy')) {
     delete env.HTTP_PROXY
     delete env.HTTPS_PROXY

lib/connection/process/remote.js

@@ -180,6 +180,9 @@ export function get_ (path, args) {
             let sessionName = atom.config.get('julia-client.remoteOptions.tmuxName')
             exec += `/bin/sh -c '`
             exec += `tmux new -s ${sessionName} '\\''`
+            if (pkgServer()) {
+              exec += ` JULIA_PKG_SERVER="${pkgServer()}" `
+            }
             if (threadCount() !== undefined) {
               exec += ` JULIA_NUM_THREADS="${threadCount()}" `
             }
@@ -194,8 +197,11 @@ export function get_ (path, args) {
             exec += `'`
           } else {
             exec += `/bin/sh -c '`
+            if (pkgServer()) {
+              exec += ` JULIA_PKG_SERVER="${pkgServer()}" `
+            }
             if (threadCount() !== undefined) {
-              exec += `JULIA_NUM_THREADS="${threadCount()}" `
+              exec += ` JULIA_NUM_THREADS="${threadCount()}" `
             }
             exec += `${jlpath} ${args.join(' ')} -e '\\''`
             // could automatically escape single quotes with `replace(/'/, `'\\'\\\\\\'\\''`)`,
@@ -286,6 +292,10 @@ export function get_ (path, args) {
   })
 }
 
+function pkgServer () {
+  return atom.config.get('julia-client.juliaOptions.packageServer')
+}
+
 function threadCount () {
   let confnt = atom.config.get('julia-client.juliaOptions.numberOfThreads')
   let confntInt = parseInt(confnt)

lib/package/config.coffee

@@ -28,6 +28,15 @@ config =
         default: 'Basic'
         radio: true
         order: 1
+      packageServer:
+        title: 'Package Server'
+        type: 'string'
+        description: 'Julia package server. Set\'s the `JULIA_PKG_SERVER` environment
+                      variable *before* starting a Julia process. Leave this empty to
+                      use the systemwide default.
+                      Requires a restart of the Julia process.'
+        default: ''
+        order: 1.5
       optimisationLevel:
         title: 'Optimisation Level'
         description: 'Higher levels take longer to compile, but produce faster code.'