diff --git a/menu.sh b/menu.sh index 866cc86..a808c58 100644 --- a/menu.sh +++ b/menu.sh @@ -5,15 +5,15 @@ source /etc/functions.sh -RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Ultimate Crypto-Server Setup Installer v1.31" --menu "Choose one" -1 60 5 \ +RESULT=$(dialog --stdout --default-item 1 --title "Ultimate Crypto-Server Setup Installer v1.32" --menu "Choose one" -1 60 5 \ ' ' "- For small private pools -" \ 1 "YiiMP - Single Server" \ -' ' "- If you plan on adding more servers later -" +' ' "- If you plan on adding more servers later -" \ 2 "YiiMP - Single Server with WireGuard" \ -3 Exit 2>&1 > /dev/tty) +3 Exit) if [ $RESULT = ] then -bash $(basename $0) && exit; +exit; fi if [ $RESULT = 1 ] diff --git a/questions.sh b/questions.sh index 4a9aa13..08263e5 100644 --- a/questions.sh +++ b/questions.sh @@ -10,13 +10,21 @@ if [[ ("$wireguard" == "true") ]]; then source $STORAGE_ROOT/yiimp/.wireguard.conf fi +if [[ ("$wireguard" == "true") ]]; then message_box "Ultimate Crypto-Server Setup Installer" \ -"You have choosen to install YiiMP Single Server! -\n\nThis option will install all componets of YiiMP on a single server. +"You have choosen to install YiiMP Single Server with WireGuard! +\n\nThis option will install all componets of YiiMP on a single server along with WireGuard so you can easily add additional servers in the future. \n\nPlease make sure any domain name or sub domain names are pointed to this servers IP prior to running this installer. \n\nAfter answering the following questions, setup will be automated. \n\nNOTE: If installing on a system with less then 8 GB of RAM you may experience system issues!" - +else + message_box "Ultimate Crypto-Server Setup Installer" \ + "You have choosen to install YiiMP Single Server! + \n\nThis option will install all componets of YiiMP on a single server. + \n\nPlease make sure any domain name or sub domain names are pointed to this servers IP prior to running this installer. + \n\nAfter answering the following questions, setup will be automated. + \n\nNOTE: If installing on a system with less then 8 GB of RAM you may experience system issues!" +fi dialog --title "Using Sub-Domain" \ --yesno "Are you using a sub-domain for the main website domain? Example pool.example.com? Make sure the DNS is updated!" 7 60 response=$?