From bf6576f61e1bef029042c1a1a3fe4cf4cce642c5 Mon Sep 17 00:00:00 2001 From: Stephen Blackstone Date: Mon, 24 Jun 2019 12:06:15 -0400 Subject: [PATCH 1/2] Allow user to use env variables with gatewaystart.sh --- resources/gatewaystart.sh | 26 +++++++++++++------------- resources/gatewaystartmacos.sh | 25 +++++++++++++------------ 2 files changed, 26 insertions(+), 25 deletions(-) mode change 100644 => 100755 resources/gatewaystart.sh mode change 100644 => 100755 resources/gatewaystartmacos.sh diff --git a/resources/gatewaystart.sh b/resources/gatewaystart.sh old mode 100644 new mode 100755 index e07e39c..06c8564 --- a/resources/gatewaystart.sh +++ b/resources/gatewaystart.sh @@ -18,19 +18,19 @@ #=============================================================================+ -TWS_MAJOR_VRSN=972 -IBC_INI=~/ibc/config.ini -TRADING_MODE= -IBC_PATH=/opt/ibc -TWS_PATH=~/Jts -TWS_SETTINGS_PATH= -LOG_PATH=~/ibc/logs -TWSUSERID= -TWSPASSWORD= -FIXUSERID= -FIXPASSWORD= -JAVA_PATH= -HIDE= +TWS_MAJOR_VRSN=${TWS_MAJOR_VRSN:-972} +IBC_INI=${IBC_INI:-"${HOME}/ibc/config.ini"} +TRADING_MODE=${TRADING_MODE:-""} +IBC_PATH=${IBC_PATH:-"/opt/ibc"} +TWS_PATH=${TWS_PATH:-"${HOME}/Jts"} +TWS_SETTINGS_PATH=${TWS_SETTINGS_PATH:-""} +LOG_PATH=${LOG_PATH:-"${HOME}/ibc/logs"} +TWSUSERID=${TWSUSERID:-""} +TWSPASSWORD=${TWSPASSWORD:-""} +FIXUSERID=${FIXUSERID:-""} +FIXPASSWORD=${FIXPASSWORD:-""} +JAVA_PATH=${JAVA_PATH:-""} +HIDE=${HIDE:-""} # PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE !! diff --git a/resources/gatewaystartmacos.sh b/resources/gatewaystartmacos.sh old mode 100644 new mode 100755 index 205e695..52f09b5 --- a/resources/gatewaystartmacos.sh +++ b/resources/gatewaystartmacos.sh @@ -18,18 +18,19 @@ #=============================================================================+ -TWS_MAJOR_VRSN=972 -IBC_INI=~/ibc/config.ini -TRADING_MODE= -IBC_PATH=/opt/ibc -TWS_PATH=~/Applications -TWS_CONFIG_PATH=~/Jts -LOG_PATH=~/ibc/logs -TWSUSERID= -TWSPASSWORD= -FIXUSERID= -FIXPASSWORD= -JAVA_PATH= +TWS_MAJOR_VRSN=${TWS_MAJOR_VRSN:-972} +IBC_INI=${IBC_INI:-"${HOME}/ibc/config.ini"} +TRADING_MODE=${TRADING_MODE:-""} +IBC_PATH=${IBC_PATH:-"/opt/ibc"} +TWS_PATH=${TWS_PATH:-"${HOME}/Jts"} +TWS_SETTINGS_PATH=${TWS_SETTINGS_PATH:-""} +LOG_PATH=${LOG_PATH:-"${HOME}/ibc/logs"} +TWSUSERID=${TWSUSERID:-""} +TWSPASSWORD=${TWSPASSWORD:-""} +FIXUSERID=${FIXUSERID:-""} +FIXPASSWORD=${FIXPASSWORD:-""} +JAVA_PATH=${JAVA_PATH:-""} +HIDE=${HIDE:-""} # PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE !! From 7a0b436e3992039f477dd3d20160852c1b1f3682 Mon Sep 17 00:00:00 2001 From: Stephen Blackstone Date: Wed, 26 Jun 2019 12:20:53 -0400 Subject: [PATCH 2/2] Make changes more user friendly while retaining ability to use env variables --- resources/gatewaystart.sh | 45 ++++++++++++++++++++++++---------- resources/gatewaystartmacos.sh | 43 ++++++++++++++++++++++---------- 2 files changed, 62 insertions(+), 26 deletions(-) diff --git a/resources/gatewaystart.sh b/resources/gatewaystart.sh index 06c8564..cee419d 100755 --- a/resources/gatewaystart.sh +++ b/resources/gatewaystart.sh @@ -18,19 +18,23 @@ #=============================================================================+ -TWS_MAJOR_VRSN=${TWS_MAJOR_VRSN:-972} -IBC_INI=${IBC_INI:-"${HOME}/ibc/config.ini"} -TRADING_MODE=${TRADING_MODE:-""} -IBC_PATH=${IBC_PATH:-"/opt/ibc"} -TWS_PATH=${TWS_PATH:-"${HOME}/Jts"} -TWS_SETTINGS_PATH=${TWS_SETTINGS_PATH:-""} -LOG_PATH=${LOG_PATH:-"${HOME}/ibc/logs"} -TWSUSERID=${TWSUSERID:-""} -TWSPASSWORD=${TWSPASSWORD:-""} -FIXUSERID=${FIXUSERID:-""} -FIXPASSWORD=${FIXPASSWORD:-""} -JAVA_PATH=${JAVA_PATH:-""} -HIDE=${HIDE:-""} +# To set one of these, remove the # in the front of the line. + +#TWS_MAJOR_VRSN=972 +#IBC_INI=~/ibc/config.ini +#TRADING_MODE= +#IBC_PATH=/opt/ibc +#TWS_PATH=~/Jts +#TWS_SETTINGS_PATH= +#LOG_PATH=~/ibc/logs +#TWSUSERID= +#TWSPASSWORD= +#FIXUSERID= +#FIXPASSWORD= +#JAVA_PATH= +#HIDE= + + # PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE !! @@ -160,6 +164,21 @@ fi APP=GATEWAY +# Ensure we have settings for everything.. +TWS_MAJOR_VRSN=${TWS_MAJOR_VRSN:-972} +IBC_INI=${IBC_INI:-"${HOME}/ibc/config.ini"} +TRADING_MODE=${TRADING_MODE:-""} +IBC_PATH=${IBC_PATH:-"/opt/ibc"} +TWS_PATH=${TWS_PATH:-"${HOME}/Jts"} +TWS_SETTINGS_PATH=${TWS_SETTINGS_PATH:-""} +LOG_PATH=${LOG_PATH:-"${HOME}/ibc/logs"} +TWSUSERID=${TWSUSERID:-""} +TWSPASSWORD=${TWSPASSWORD:-""} +FIXUSERID=${FIXUSERID:-""} +FIXPASSWORD=${FIXPASSWORD:-""} +JAVA_PATH=${JAVA_PATH:-""} +HIDE=${HIDE:-""} + export TWS_MAJOR_VRSN export IBC_INI export TRADING_MODE diff --git a/resources/gatewaystartmacos.sh b/resources/gatewaystartmacos.sh index 52f09b5..f565e7c 100755 --- a/resources/gatewaystartmacos.sh +++ b/resources/gatewaystartmacos.sh @@ -18,19 +18,21 @@ #=============================================================================+ -TWS_MAJOR_VRSN=${TWS_MAJOR_VRSN:-972} -IBC_INI=${IBC_INI:-"${HOME}/ibc/config.ini"} -TRADING_MODE=${TRADING_MODE:-""} -IBC_PATH=${IBC_PATH:-"/opt/ibc"} -TWS_PATH=${TWS_PATH:-"${HOME}/Jts"} -TWS_SETTINGS_PATH=${TWS_SETTINGS_PATH:-""} -LOG_PATH=${LOG_PATH:-"${HOME}/ibc/logs"} -TWSUSERID=${TWSUSERID:-""} -TWSPASSWORD=${TWSPASSWORD:-""} -FIXUSERID=${FIXUSERID:-""} -FIXPASSWORD=${FIXPASSWORD:-""} -JAVA_PATH=${JAVA_PATH:-""} -HIDE=${HIDE:-""} +# To set one of these, remove the # in the front of the line. + +#TWS_MAJOR_VRSN=972 +#IBC_INI=~/ibc/config.ini +#TRADING_MODE= +#IBC_PATH=/opt/ibc +#TWS_PATH=~/Jts +#TWS_SETTINGS_PATH= +#LOG_PATH=~/ibc/logs +#TWSUSERID= +#TWSPASSWORD= +#FIXUSERID= +#FIXPASSWORD= +#JAVA_PATH= +#HIDE= # PLEASE DON'T CHANGE ANYTHING BELOW THIS LINE !! @@ -142,6 +144,21 @@ HIDE=${HIDE:-""} APP=GATEWAY +# Ensure we have settings for everything.. +TWS_MAJOR_VRSN=${TWS_MAJOR_VRSN:-972} +IBC_INI=${IBC_INI:-"${HOME}/ibc/config.ini"} +TRADING_MODE=${TRADING_MODE:-""} +IBC_PATH=${IBC_PATH:-"/opt/ibc"} +TWS_PATH=${TWS_PATH:-"${HOME}/Jts"} +TWS_SETTINGS_PATH=${TWS_SETTINGS_PATH:-""} +LOG_PATH=${LOG_PATH:-"${HOME}/ibc/logs"} +TWSUSERID=${TWSUSERID:-""} +TWSPASSWORD=${TWSPASSWORD:-""} +FIXUSERID=${FIXUSERID:-""} +FIXPASSWORD=${FIXPASSWORD:-""} +JAVA_PATH=${JAVA_PATH:-""} +HIDE=${HIDE:-""} + export TWS_MAJOR_VRSN export IBC_INI export TRADING_MODE