dabo/dabo-prep.sh

@@ -41,7 +41,7 @@ set +a
 mkdir -p ${BASEPATH}/botdata/asset-histories
 cd ${BASEPATH}/botdata
 
-ECO_ASSETS="DXY DOWJONES SP500 NASDAQ MSCIEAFE 10YRTREASURY GOLD MSCIWORLD OILGAS KRE EUR-USD"
+ECO_ASSETS="DXY DOWJONES SP500 NASDAQ MSCIEAFE 10YRTREASURY OIL GOLD MSCIWORLD OILGAS KRE EUR-USD"
 
 . ../../dabo-bot.conf
 . ../../dabo-bot.override.conf

dabo/functions/get_values.sh

@@ -40,25 +40,20 @@ function get_values {
   # get current prices from exchange
   get_symbols_ticker
   # get values from csv files
-  #f_first=true
+  f_first=true
   for f_asset in $f_assets BTC${CURRENCY} $f_eco_assets
   do
 
     # read latest ohlcv data and indicators per timeframe to vars
     for f_time in 5m 15m 1h 4h 1d 1w
     do
-      #f_prefix="${f_asset}_${f_time}_"
-      #[ "$f_first" = "true" ] && f_prefix="${f_time}_"
-      f_prefix="${f_time}_"
-      if [[ "$f_asset" =~ ^ECONOMY- ]] 
-      then
-        f_prefix="${f_asset}_${f_time}_"
-        f_prefix=${f_prefix//-/_}
-      fi
+      f_prefix="${f_asset}_${f_time}_"
+      [ "$f_first" = "true" ] && f_prefix="${f_time}_"
+      f_prefix=${f_prefix//-/_}
       f_histfile="asset-histories/${f_asset}.history.${f_time}.csv"
       if ! [ -s "$f_histfile" ]
       then
-        g_echo_warn "file $f_histfile empty or does not exist"
+        g_echo_note "file $f_histfile emty or does not exist"
         f_return=1
         continue
       fi
@@ -95,13 +90,13 @@ function get_values {
       fi
     done
     
-    #unset f_first
+    unset f_first
   
   done
 
   for i in "${!v[@]}"
   do 
-    echo "\${v[$i]}=${v[$i]}"
+    echo "\${v[$i]} = ${v[$i]}"
   done | sort >values.new
   mv values.new values