Make changes more user friendly while retaining ability to use env va…

…riables
IbcAlpha · Jun 26, 2019 · 7a0b436 · 7a0b436
1 parent bf6576f
commit 7a0b436
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 26 deletions.
diff --git 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
@@ -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