fix variables.

typerefinery-ai · Sep 20, 2023 · 181caed · 181caed
1 parent d920d13
commit 181caed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/services/_python/service.json b/services/_python/service.json
@@ -24,8 +24,8 @@
     },
     "setup": {
       "win32": [
-        "; copy ${SERVICE_PATH}\\..\\get-pip.py ${SERVICE_EXECUTABLE_HOME}\\get-pip.py",
-        "; copy ${SERVICE_PATH}\\..\\requirements.txt ${SERVICE_EXECUTABLE_HOME}\\requirements.txt",
+        "; copy ${SERVICE_PATH}\\get-pip.py ${SERVICE_EXECUTABLE_HOME}\\get-pip.py",
+        "; copy ${SERVICE_PATH}\\requirements.txt ${SERVICE_EXECUTABLE_HOME}\\requirements.txt",
         "; echo Lib/site-packages >> ${SERVICE_EXECUTABLE_HOME}\\python311._pth",
         "; echo import site >> ${SERVICE_EXECUTABLE_HOME}\\python311._pth",
         "-m sysconfig",
@@ -49,7 +49,7 @@
       "default": " -c \"import os,sysconfig;print('PYTHON_SCRIPTS_PATH:'+sysconfig.get_path('scripts',f'{os.name}_user'))\""
     },
     "outputvarregex": {
-      "PYTHON_SCRIPTS_PATHA": "PYTHON_SCRIPTS_PATH:(.*)"
+      "PYTHON_SCRIPTS_PATH": "PYTHON_SCRIPTS_PATH:(.*)"
     },
     "env": {
       "PATH": "${SERVICE_EXECUTABLE_HOME}",

diff --git a/services/postgredb-admin/service.json b/services/postgredb-admin/service.json
@@ -32,7 +32,7 @@
       "PGADMIN_INT_PORT": "${SERVICE_PORT}",
       "CONSOLE_LOG_LEVEL": "INFO",
       "FILE_LOG_LEVEL": "INFO",
-      "PYTHONPATH": "${PYTHON_HOME}",
+      "PYTHONPATH": "${SERVICE_PATH}/__packages__",
       "PYTHONUSERBASE": "${PYTHON_HOME}",
       "PATH": [
         "${PYTHON_HOME}",

diff --git a/services/typedb/service.json b/services/typedb/service.json
@@ -23,16 +23,16 @@
       }
     },
     "commandline": {
-      "win32": "-Xms256m -Xmx1024m -cp \"${SERVICE_PATH}\\server\\lib\\*;\" -D\"typedb.dir=${SERVICE_PATH}\" com.vaticle.typedb.core.server.TypeDBServer --config=\"${SERVICE_PATH}\\server\\conf\\config.yml\" --storage.data=\"${SERVICE_DATA_PATH}\" --server.address 0.0.0.0:${SERVICE_PORT}",
-      "darwin": "-Xms256m -Xmx1024m -cp \"${SERVICE_PATH}/server/lib/*\" -D\"typedb.dir=${SERVICE_PATH}\" com.vaticle.typedb.core.server.TypeDBServer --config=\"${SERVICE_PATH}/server/conf/config.yml\" --storage.data=\"${SERVICE_DATA_PATH}\" --server.address 0.0.0.0:${SERVICE_PORT}",
-      "linux": "-Xms256m -Xmx1024m -cp \"${SERVICE_PATH}/server/lib/*\" -D\"typedb.dir=\"${SERVICE_PATH}\" com.vaticle.typedb.core.server.TypeDBServer --config=\"${SERVICE_PATH}/server/conf/config.yml\" --storage.data=\"${SERVICE_DATA_PATH}\" --server.address 0.0.0.0:${SERVICE_PORT}",
-      "default": "-Xms256m -Xmx1024m -cp \"${SERVICE_PATH}\\server\\lib\\*\" -D\"typedb.dir=${SERVICE_PATH}\" com.vaticle.typedb.core.server.TypeDBServer --config=\"${SERVICE_PATH}\\server\\conf\\config.yml\" --storage.data=\"${SERVICE_DATA_PATH}\" --server.address 0.0.0.0:${SERVICE_PORT}"
+      "win32": "-Xms256m -Xmx1024m -cp \"${SERVICE_BIN_PATH}\\server\\lib\\*;\" -D\"typedb.dir=${SERVICE_BIN_PATH}\" com.vaticle.typedb.core.server.TypeDBServer --config=\"${SERVICE_BIN_PATH}\\server\\conf\\config.yml\" --storage.data=\"${SERVICE_DATA_PATH}\" --server.address 0.0.0.0:${SERVICE_PORT}",
+      "darwin": "-Xms256m -Xmx1024m -cp \"${SERVICE_BIN_PATH}/server/lib/*\" -D\"typedb.dir=${SERVICE_BIN_PATH}\" com.vaticle.typedb.core.server.TypeDBServer --config=\"${SERVICE_BIN_PATH}/server/conf/config.yml\" --storage.data=\"${SERVICE_DATA_PATH}\" --server.address 0.0.0.0:${SERVICE_PORT}",
+      "linux": "-Xms256m -Xmx1024m -cp \"${SERVICE_BIN_PATH}/server/lib/*\" -D\"typedb.dir=\"${SERVICE_BIN_PATH}\" com.vaticle.typedb.core.server.TypeDBServer --config=\"${SERVICE_BIN_PATH}/server/conf/config.yml\" --storage.data=\"${SERVICE_DATA_PATH}\" --server.address 0.0.0.0:${SERVICE_PORT}",
+      "default": "-Xms256m -Xmx1024m -cp \"${SERVICE_BIN_PATH}\\server\\lib\\*\" -D\"typedb.dir=${SERVICE_BIN_PATH}\" com.vaticle.typedb.core.server.TypeDBServer --config=\"${SERVICE_BIN_PATH}\\server\\conf\\config.yml\" --storage.data=\"${SERVICE_DATA_PATH}\" --server.address 0.0.0.0:${SERVICE_PORT}"
     },
     "commandlinecli": {
-      "win32": "-Xms256m -Xmx1024m -cp \"${SERVICE_PATH}\\console\\conf\\;${SERVICE_PATH}\\console\\lib\\*;\" -D\"org.jline.terminal.dumb=true\" -D\"typedb.dir=${SERVICE_PATH}\" com.vaticle.typedb.console.TypeDBConsole --server 0.0.0.0:${SERVICE_PORT} ",
-      "darwin": "-Xms256m -Xmx1024m -cp \"${SERVICE_PATH}/console/conf/:${SERVICE_PATH}/console/lib/*:\" -D\"org.jline.terminal.dumb=true\" -D\"typedb.dir=${SERVICE_PATH}\" com.vaticle.typedb.console.TypeDBConsole --server 0.0.0.0:${SERVICE_PORT} ",
-      "linux": "-Xms256m -Xmx1024m -cp \"${SERVICE_PATH}/console/conf/:${SERVICE_PATH}/console/lib/*:\" -D\"org.jline.terminal.dumb=true\" -D\"typedb.dir=${SERVICE_PATH}\" com.vaticle.typedb.console.TypeDBConsole --server 0.0.0.0:${SERVICE_PORT} ",
-      "default": "-Xms256m -Xmx1024m -cp \"${SERVICE_PATH}\\console\\conf\\;${SERVICE_PATH}\\console\\lib\\*;\" -D\"org.jline.terminal.dumb=true\" -D\"typedb.dir=${SERVICE_PATH}\" com.vaticle.typedb.console.TypeDBConsole --server 0.0.0.0:${SERVICE_PORT} "
+      "win32": "-Xms256m -Xmx1024m -cp \"${SERVICE_BIN_PATH}\\console\\conf\\;${SERVICE_BIN_PATH}\\console\\lib\\*;\" -D\"org.jline.terminal.dumb=true\" -D\"typedb.dir=${SERVICE_BIN_PATH}\" com.vaticle.typedb.console.TypeDBConsole --server 0.0.0.0:${SERVICE_PORT} ",
+      "darwin": "-Xms256m -Xmx1024m -cp \"${SERVICE_BIN_PATH}/console/conf/:${SERVICE_BIN_PATH}/console/lib/*:\" -D\"org.jline.terminal.dumb=true\" -D\"typedb.dir=${SERVICE_BIN_PATH}\" com.vaticle.typedb.console.TypeDBConsole --server 0.0.0.0:${SERVICE_PORT} ",
+      "linux": "-Xms256m -Xmx1024m -cp \"${SERVICE_BIN_PATH}/console/conf/:${SERVICE_BIN_PATH}/console/lib/*:\" -D\"org.jline.terminal.dumb=true\" -D\"typedb.dir=${SERVICE_BIN_PATH}\" com.vaticle.typedb.console.TypeDBConsole --server 0.0.0.0:${SERVICE_PORT} ",
+      "default": "-Xms256m -Xmx1024m -cp \"${SERVICE_BIN_PATH}\\console\\conf\\;${SERVICE_BIN_PATH}\\console\\lib\\*;\" -D\"org.jline.terminal.dumb=true\" -D\"typedb.dir=${SERVICE_BIN_PATH}\" com.vaticle.typedb.console.TypeDBConsole --server 0.0.0.0:${SERVICE_PORT} "
     },
     "datapath": "/server/data",
     "serviceport": 8729,