Merge pull request #10 from afiniel/afine-dev

Clean up.
- > Small fixes

README.md

@@ -1,4 +1,4 @@
-<h1 align="center"> Yiimpool Yiimp Install Scrypt v0.6.6 With DaemonBuilder and addport (update 2022-12-17) </h1>
+<h1 align="center"> Yiimpool Yiimp Install Scrypt v0.6.7 With DaemonBuilder And Addport Support (update 2022-12-21) </h1>
 
 <img alt="Discord" src="https://img.shields.io/discord/904564600354254898?label=Discord"><img alt="GitHub issues" src="https://img.shields.io/github/issues/afiniel/yiimp_install_script" ><img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/afiniel/yiimp_install_script">
 

daemon_builder/menu.sh

@@ -18,7 +18,10 @@ RESULT=$(dialog --stdout --nocancel --default-item 1 --title "DamonBuilder" --me
 ' ' "- NOT WORKING YET. WORK IN PROGRESS If your last coin failed to build try this -" \
 3 " WORK IN-PROGRESS! Daemon Build Failed - Help!" \
 4 Exit)
-
+if [ $RESULT = ]
+then
+bash $(basename $0) && exit;
+fi
 
 if [ $RESULT = 1 ]
 then

daemon_builder/menu2.sh

@@ -18,7 +18,10 @@ RESULT=$(dialog --stdout --title "DaemonBuilder" --menu "Choose one" -1 60 7 \
 4 "Install Coin with makefile.unix file" \
 5 "Install Coin with CMake file" \
 6 Exit)
-
+if [ $RESULT = ]
+then
+bash $(basename $0) && exit;
+fi
 
 if [ $RESULT = 1 ]
 then

daemon_builder/menu3.sh

@@ -12,6 +12,10 @@ RESULT=$(dialog --stdout --title "DaemonBuilder" --menu "Choose one" -1 60 4 \
 2 "Update Berkeley 5.x Coin with autogen file" \
 3 "Update Coin with makefile.unix file" \
 4 Exit)
+if [ $RESULT = ]
+then
+bash $(basename $0) && exit;
+fi
 
 if [ $RESULT = 1 ]
 then

install.sh

@@ -1,17 +1,15 @@
 #!/usr/bin/env bash
-
-
 #########################################################
 # Source https://mailinabox.email/ https://github.com/mail-in-a-box/mailinabox
 # Updated by Afiniel for Yiimpool use...
 # This script is intended to be run like this:
 #
 # curl https://raw.githubusercontent.com/afiniel/yiimp_install_script/master/install.sh | bash
-
+# 
 #
 #########################################################
 if [ -z "${TAG}" ]; then
-	TAG=v0.6.6
+	TAG=v0.6.7
 fi
 
 
@@ -52,4 +50,4 @@ if [ "${TAG}" != `git describe --tags` ]; then
 fi
 
 # Start setup script.
-bash $HOME/yiimp_install_script/install/start.sh
+bash $HOME/yiimp_install_script/install/start.sh

install/functions.sh

@@ -82,7 +82,7 @@ function install_end_message {
 	figlet -f slant -w 100 "Complete!"
 
 	echo -e "$CYAN  --------------------------------------------------------------------------- 	  		$COL_RESET"
-	echo -e "$YELLOW  | Version:$GREEN v0.6.6                                                 |				$COL_RESET"
+	echo -e "$YELLOW  | Version:$GREEN v0.6.7                                                 |				$COL_RESET"
 	echo -e "$YELLOW Yiimp Installer Script Fork By Afiniel https://github.com/afiniel/yiimp_install_script $COL_RESET"
 	echo -e "$CYAN  --------------------------------------------------------------------------- 	  		$COL_RESET"
 	echo -e "$YELLOW   Your mysql information (login/Password) is saved in:$RED ~/.my.cnf					$COL_RESET"
@@ -113,7 +113,7 @@ function term_art {
 	figlet -f slant -w 100 "YiimpooL" | lolcat
 	echo -e "$CYAN   ----------------------------------------------------------> 	  											$COL_RESET"
 	echo -e "$CYAN  |$YELLOW Yiimp Installer Script Fork By Afiniel!												$COL_RESET"
-	echo -e "$CYAN  |$MAGENTA Version:$GREEN v0.6.6 														$COL_RESET"
+	echo -e "$CYAN  |$MAGENTA Version:$GREEN v0.6.7 														$COL_RESET"
 	echo -e "$CYAN   ----------------------------------------------------------------------> 	  			$COL_RESET"
 	echo -e "$CYAN  |$YELLOW This script will install all the dependencies and will install Yiimp.					$COL_RESET"
 	echo -e "$CYAN  |$YELLOW It will also install a MySQL database and a Web server.								$COL_RESET"
@@ -131,7 +131,7 @@ function term_yiimpool {
 	figlet -f slant -w 100 "YiimpooL" | lolcat
 	echo -e "$CYAN   -----------------|--------------------- 	  											$COL_RESET"
 	echo -e "$YELLOW  Yiimp Installer Script Fork By Afiniel!												$COL_RESET"
-	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.6 											$COL_RESET"
+	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.7 											$COL_RESET"
 	echo -e "$CYAN   -----------------|--------------------- 	  			$COL_RESET"
 	echo
 
@@ -183,14 +183,14 @@ function hide_output {
 function last_words {
 	echo "<-------------------------------------|---------------------------------------->"
 	echo
-	echo -e "$YELLOW Thank you for using the Yiimpool Installer $GREEN v0.6.6             $COL_RESET"
+	echo -e "$YELLOW Thank you for using the Yiimpool Installer $GREEN v0.6.7             $COL_RESET"
 	echo
 	echo -e "$YELLOW To run this installer anytime simply type: $GREEN yiimpool            $COL_RESET"
 	echo -e "$YELLOW Donations for continued support of this script are welcomed at:       $COL_RESET"
 	echo "<-------------------------------------|--------------------------------------->"
 	echo -e "$YELLOW                     Donate Wallets:                                   $COL_RESET"
 	echo "<-------------------------------------|--------------------------------------->"
-	echo -e "$YELLOW Thank you for using Yiimp Install Script v0.6.6 fork by Afiniel!      $COL_RESET"
+	echo -e "$YELLOW Thank you for using Yiimp Install Script v0.6.7 fork by Afiniel!      $COL_RESET"
 	echo
 	echo -e "$YELLOW =>  To run this installer anytime simply type:$GREEN yiimpool         $COL_RESET"
 	echo -e "$YELLOW =>  Do you want to support me? Feel free to use wallets below:        $COL_RESET"

install/menu.sh

@@ -7,14 +7,19 @@
 
 source /etc/functions.sh
 
-RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Menu v0.6.6" --menu "Choose one" -1 60 16 \
+RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Menu v0.6.7" --menu "Choose one" -1 60 16 \
 ' ' "- Install Yiimp  -" \
 1 "YiiMP Single Server" \
 ' ' "- Daemon Wallet Builder -" \
 2 "Daemonbuilder" \
 ' ' "- Upgrade stratum server -" \
 3 "Yiimp stratum update NOT completed" \
 4 Exit)
+if [ $RESULT = ]
+then
+bash $(basename $0) && exit;
+fi
+
 if [ $RESULT = 1 ]
 then
 clear;
@@ -32,10 +37,9 @@ fi
 if [ $RESULT = 3 ]
 then
 clear;
-echo The Yiimp upgrader is not completed yet.;
+echo The Yiimp upgrader is not completed yet.
 exit;
-# cd $HOME/yiimp_install_script/yiimp_upgrade
-# source start.sh
+fi
 
 if [ $RESULT = 4 ]
 then

install/start.sh

@@ -52,7 +52,7 @@ if [[ ("$FIRST_TIME_SETUP" == "1") ]]; then
     export NCURSES_NO_UTF8_ACS=1
 
     #check for user
-    echo -e "$YELLOW => Installing needed packages for setup to continue  <= $COL_RESET"
+    echo -e "$YELLOW => Installing needed packages for setup to$GREEN continue$YELLOW  <= $COL_RESET"
     hide_output sudo apt-get -q -q update
     hide_output sudo apt-get install -y figlet
     hide_output sudo apt-get install -y lolcat
@@ -64,7 +64,7 @@ if [[ ("$FIRST_TIME_SETUP" == "1") ]]; then
         message_box "Yiimpool Installer" \
         "Hello and thanks for using the Yiimpool Installer!
         \n\nInstallation for the most part is fully automated. In most cases any user responses that are needed are asked prior to the installation.
-        \n\nNOTE: You should only install this on a brand new Ubuntu 16.04 or Ubuntu 18.04 installation."
+        \n\nNOTE: You should only install this on a brand new Ubuntu 18.04 or Ubuntu 16.04 installation."
         source existing_user.sh
         exit
     else

old_installer_files/conf/create_user.sh

@@ -13,12 +13,12 @@ echo 'YIIMPOOL_VERSION="v0.4.2"' | sudo -E tee /etc/yiimpoolversion.conf >/dev/n
 source /etc/yiimpoolversion.conf
 
 # Welcome
-message_box "Yiimp Installer v0.6.6" \
+message_box "Yiimp Installer v0.6.7" \
   "Hello and thanks for using the Yiimpool Installer!
 \n\nInstallation for the most part is fully automated. In most cases any user responses that are needed are asked prior to the installation.
 \n\nNOTE: You should only install this on a brand new Ubuntu 16.04 or Ubuntu 18.04 installation."
 # Root warning message box
-message_box "Yiimp Installer v0.6.6" \
+message_box "Yiimp Installer v0.6.7" \
   "WARNING: You are trying to install as the root user!
 \n\nRunning any program as root is not recommended and can pose serious security risks that you want to avoid.
 \n\nThe next step you will be asked to create a new user account, you can name it whatever you want."

old_installer_files/conf/functions.sh

@@ -80,7 +80,7 @@ function install_end_message {
 	figlet -f slant -w 100 "Complete!"
 
 	echo -e "$CYAN  --------------------------------------------------------------------------- 	  		$COL_RESET"
-	echo -e "$YELLOW  | Version:$GREEN v0.6.6                                                 |				$COL_RESET"
+	echo -e "$YELLOW  | Version:$GREEN v0.6.7                                                 |				$COL_RESET"
 	echo -e "$YELLOW Yiimp Installer Script Fork By Afiniel https://github.com/afiniel/yiimp_install_script $COL_RESET"
 	echo -e "$CYAN  --------------------------------------------------------------------------- 	  		$COL_RESET"
 	echo -e "$YELLOW   Your mysql information (login/Password) is saved in:$RED ~/.my.cnf					$COL_RESET"
@@ -115,7 +115,7 @@ function term_art {
 	echo "   ╚═╝   ╚═╝╚═╝╚═╝     ╚═╝╚═╝      ╚═════╝  ╚═════╝ ╚══════╝ "
 	echo -e "$CYAN   ---------------|----------------------- 	  											$COL_RESET"
 	echo -e "$YELLOW  Yiimp Installer Script Fork By Afiniel!												$COL_RESET"
-	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.6 														$COL_RESET"
+	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.7 														$COL_RESET"
 	echo -e "$CYAN   -----------------|---------------------------------------------------- 	  			$COL_RESET"
 	echo -e "$YELLOW  This script will install all the dependencies and will install Yiimp.					$COL_RESET"
 	echo -e "$YELLOW  It will also install a MySQL database and a Web server.								$COL_RESET"
@@ -138,7 +138,7 @@ function term_yiimpool {
 	echo "   ╚═╝   ╚═╝╚═╝╚═╝     ╚═╝╚═╝      ╚═════╝  ╚═════╝ ╚══════╝ "
 	echo -e "$CYAN   -----------------|--------------------- 	  											$COL_RESET"
 	echo -e "$YELLOW  Yiimp Installer Script Fork By Afiniel!												$COL_RESET"
-	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.6 											$COL_RESET"
+	echo -e "$YELLOW  Version:$COL_RESET $GREEN v0.6.7 											$COL_RESET"
 	echo -e "$CYAN   -----------------|--------------------- 	  			$COL_RESET"
 	echo
 
@@ -190,14 +190,14 @@ function hide_output {
 function last_words {
 	echo "<-------------------------------------|---------------------------------------->"
 	echo
-	echo -e "$YELLOW Thank you for using the Yiimpool Installer $GREEN v0.6.6!             $COL_RESET"
+	echo -e "$YELLOW Thank you for using the Yiimpool Installer $GREEN v0.6.7!             $COL_RESET"
 	echo
 	echo -e "$YELLOW To run this installer anytime simply type: $GREEN yiimpool            $COL_RESET"
 	echo -e "$YELLOW Donations for continued support of this script are welcomed at:       $COL_RESET"
 	echo "<-------------------------------------|--------------------------------------->"
 	echo -e "$YELLOW                     Donate Wallets:                                   $COL_RESET"
 	echo "<-------------------------------------|--------------------------------------->"
-	echo -e "$YELLOW Thank you for using Yiimp Install Script v0.6.6 fork by Afiniel!      $COL_RESET"
+	echo -e "$YELLOW Thank you for using Yiimp Install Script v0.6.7 fork by Afiniel!      $COL_RESET"
 	echo
 	echo -e "$YELLOW =>  To run this installer anytime simply type:$GREEN yiimpool         $COL_RESET"
 	echo -e "$YELLOW =>  Do you want to support me? Feel free to use wallets below:        $COL_RESET"

old_installer_files/conf/menu.sh

@@ -6,7 +6,7 @@
 source /etc/functions.sh
 source /etc/yiimpoolversion.conf
 
-RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Installer v0.6.6" --menu "Choose one" -1 60 16 \
+RESULT=$(dialog --stdout --nocancel --default-item 1 --title "Yiimpool Installer v0.6.7" --menu "Choose one" -1 60 16 \
 ' ' "-  Yiimp  -" \
 1 "Start Yiimp Install" \
 ' ' "- Daemon Wallet Builder -" \

old_installer_files/conf/start.sh

@@ -75,7 +75,7 @@ if [[ ("$FIRST_TIME_SETUP" == "1") ]]; then
     # Are we running as root?
     if [[ $EUID -ne 0 ]]; then
         # Welcome
-        message_box "Yiimp Installer v0.6.6" \
+        message_box "Yiimp Installer v0.6.7" \
         "Hello and thanks for using the Yiimpool Installer!
         \n\nInstallation for the most part is fully automated. In most cases any user responses that are needed are asked prior to the installation.
         \n\nNOTE: You should only install this on a brand new Ubuntu 16.04 or Ubuntu 18.04 VPS."