Merge d39b34a into c2ac96c

tableau · Apr 9, 2019 · 3cf82c7 · 3cf82c7
2 parents c2ac96c + d39b34a
commit 3cf82c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/startup.cmd b/startup.cmd
@@ -50,7 +50,7 @@ SET PYTHONPATH=%TABPY_ROOT%\tabpy-server;%TABPY_ROOT%\tabpy-tools;%PYTHONPATH%
 SET STARTUP_CMD=python tabpy-server\tabpy_server\tabpy.py
 IF [%1] NEQ [] (
     ECHO     Using config file at %TABPY_ROOT%\tabpy-server\tabpy_server\%1
-    SET STARTUP_CMD=%STARTUP_CMD% --config=%1
+    SET STARTUP_CMD=%STARTUP_CMD% --config=%TABPY_ROOT%\tabpy-server\tabpy_server\%1
 )
 
 

diff --git a/startup.sh b/startup.sh
@@ -70,7 +70,7 @@ if [ -z $CONFIG ]; then
     echo Using default parameters.
     python3 tabpy-server/tabpy_server/tabpy.py
 else
-    python3 tabpy-server/tabpy_server/tabpy.py --config=$CONFIG
+    python3 tabpy-server/tabpy_server/tabpy.py --config=${TABPY_ROOT}/tabpy-server/tabpy_server/$CONFIG
 fi
 
 export PYTHONPATH=$SAVE_PYTHONPATH