Setup.sh: make message format consistent

This commit is contained in:
Gerald Lonlas 2018-05-29 20:48:34 -07:00
parent c471ccb2db
commit 5a4eb2cbf2

View File

@ -2,16 +2,17 @@
#encoding=utf8 #encoding=utf8
function updateenv () { function updateenv () {
echo " echo "-------------------------"
------------------------- echo "Update your virtual env"
Update your virtual env echo "-------------------------"
-------------------------
"
source .env/bin/activate source .env/bin/activate
pip3.6 install --upgrade pip echo "pip3 install in-progress. Please wait..."
pip3 install -r requirements.txt --upgrade pip3.6 install --quiet --upgrade pip
pip3 install -r requirements.txt pip3 install --quiet -r requirements.txt --upgrade
pip3 install -e . pip3 install --quiet -r requirements.txt
pip3 install --quiet -e .
echo "pip3 install completed"
echo
} }
# Install tab lib # Install tab lib
@ -29,7 +30,6 @@ function install_macos () {
echo "-------------------------" echo "-------------------------"
echo "Install Brew" echo "Install Brew"
echo "-------------------------" echo "-------------------------"
echo
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
fi fi
brew install python3 wget ta-lib brew install python3 wget ta-lib
@ -54,7 +54,6 @@ function reset () {
echo "----------------------------" echo "----------------------------"
echo "Reset branch and virtual env" echo "Reset branch and virtual env"
echo "----------------------------" echo "----------------------------"
echo
if [ "1" == $(git branch -vv |grep -cE "\* develop|\* master") ] if [ "1" == $(git branch -vv |grep -cE "\* develop|\* master") ]
then then
if [ -d ".env" ]; then if [ -d ".env" ]; then
@ -77,6 +76,7 @@ function reset () {
echo "Reset ignored because you are not on 'master' or 'develop'." echo "Reset ignored because you are not on 'master' or 'develop'."
fi fi
echo
python3.6 -m venv .env python3.6 -m venv .env
updateenv updateenv
} }
@ -84,11 +84,9 @@ function reset () {
function config_generator () { function config_generator () {
echo "Starting to generate config.json" echo "Starting to generate config.json"
echo
echo "-------------------------"
echo "General configuration" echo "General configuration"
echo "-------------------------" echo "-------------------------"
echo
default_max_trades=3 default_max_trades=3
read -p "Max open trades: (Default: $default_max_trades) " max_trades read -p "Max open trades: (Default: $default_max_trades) " max_trades
max_trades=${max_trades:-$default_max_trades} max_trades=${max_trades:-$default_max_trades}
@ -105,14 +103,13 @@ function config_generator () {
read -p "Fiat currency: (Default: $default_fiat_currency) " fiat_currency read -p "Fiat currency: (Default: $default_fiat_currency) " fiat_currency
fiat_currency=${fiat_currency:-$default_fiat_currency} fiat_currency=${fiat_currency:-$default_fiat_currency}
echo "------------------------"
echo "Bittrex config generator"
echo "------------------------"
echo echo
echo "Exchange config generator"
echo "------------------------"
read -p "Exchange API key: " api_key read -p "Exchange API key: " api_key
read -p "Exchange API Secret: " api_secret read -p "Exchange API Secret: " api_secret
echo "-------------------------" echo
echo "Telegram config generator" echo "Telegram config generator"
echo "-------------------------" echo "-------------------------"
read -p "Telegram Token: " token read -p "Telegram Token: " token
@ -131,6 +128,10 @@ function config_generator () {
} }
function config () { function config () {
echo "-------------------------"
echo "Config file generator"
echo "-------------------------"
if [ -f config.json ] if [ -f config.json ]
then then
read -p "A config file already exist, do you want to override it [Y/N]? " read -p "A config file already exist, do you want to override it [Y/N]? "
@ -144,22 +145,26 @@ function config () {
config_generator config_generator
fi fi
echo
echo "-------------------------"
echo "Config file generated"
echo "-------------------------"
echo "Edit ./config.json to modify Pair and other configurations." echo "Edit ./config.json to modify Pair and other configurations."
echo
} }
function install () { function install () {
echo "-------------------------" echo "-------------------------"
echo "Install mandatory dependencies" echo "Install mandatory dependencies"
echo "-------------------------" echo "-------------------------"
echo
if [ "$(uname -s)" == "Darwin" ] if [ "$(uname -s)" == "Darwin" ]
then then
echo "- You are on macOS" echo "macOS detected. Setup for this system in-progress"
install_macos install_macos
elif [ -x "$(command -v apt-get)" ] elif [ -x "$(command -v apt-get)" ]
then then
echo "- You are on Debian/Ubuntu" echo "Debian/Ubuntu detected. Setup for this system in-progress"
install_debian install_debian
else else
echo "This script does not support your OS." echo "This script does not support your OS."
@ -167,12 +172,13 @@ function install () {
echo "Wait 10 seconds to continue the next install steps or use ctrl+c to interrupt this shell." echo "Wait 10 seconds to continue the next install steps or use ctrl+c to interrupt this shell."
sleep 10 sleep 10
fi fi
echo
reset reset
echo "
- Install complete.
"
config config
echo "You can now use the bot by executing 'source .env/bin/activate; python3 freqtrade/main.py'." echo "-------------------------"
echo "Run the bot"
echo "-------------------------"
echo "You can now use the bot by executing 'source .env/bin/activate; python3.6 freqtrade/main.py'."
} }
function plot () { function plot () {