Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

weren't setting the path properly for the optional config parameter #252

Merged
merged 4 commits into from
Apr 10, 2019
Merged

weren't setting the path properly for the optional config parameter #252

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d39b34a
weren't setting the path properly for the optional config parameter
sbabayan Apr 9, 2019
3204b32
optional config file can live anywhere now
sbabayan Apr 10, 2019
12b715c
changed default TABPY_STATE_PATH in app.py and fixed all correspondin…
sbabayan Apr 10, 2019
90c73f0
fixed pep8
sbabayan Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion startup.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
sbabayan marked this conversation as resolved.
Show resolved Hide resolved
sbabayan marked this conversation as resolved.
Show resolved Hide resolved
)


Expand Down
2 changes: 1 addition & 1 deletion startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down