Merge pull request #14 from afiniel/v2.3.2

afiniel · Jan 17, 2025 · ced647c · ced647c
2 parents 4a015d1 + 04a89b3
commit ced647c
Show file tree

Hide file tree

Showing 10 changed files with 312 additions and 232 deletions.
diff --git a/README.md b/README.md
@@ -31,8 +31,8 @@ This installer provides an automated way to set up a full Yiimp mining pool on U
 - Ubuntu 18.04 LTS
 - Ubuntu 20.04 LTS
 - Ubuntu 22.04 LTS Install Works But system not tested
-- Ubuntu 23.04 LTS Not tested yet
-- Ubuntu 24.04 LTS Not tested yet
+- Ubuntu 23.04 LTS Install Works But System not tested
+- Ubuntu 24.04 LTS Install Works But system not tested
 
 ## Quick Install
 

diff --git a/daemon_builder/install.sh b/daemon_builder/install.sh
@@ -10,7 +10,7 @@
 ################################################################################
 
 if [ -z "${TAG}" ]; then
-	TAG=v2.3.1
+	TAG=v2.3.2
 fi
 
 clear

diff --git a/daemon_builder/start.sh b/daemon_builder/start.sh
@@ -14,6 +14,9 @@ if [ ! -d $STORAGE_ROOT/daemon_builder ]; then
 sudo mkdir -p $STORAGE_ROOT/daemon_builder
 fi
 
+if [[ "$DISTRO" == "24" || "$DISTRO" == "23" || "$DISTRO" == "22" ]]; then
+    sudo chmod 755 $STORAGE_ROOT/daemon_builder
+fi
 # Start the DeamonBuilder installation.
 cd $HOME/Yiimpoolv1/daemon_builder
 source requirements.sh

diff --git a/daemon_builder/utils/menu1.sh b/daemon_builder/utils/menu1.sh
@@ -9,8 +9,7 @@
 #
 
 source /etc/daemonbuilder.sh
-
-source $STORAGE_ROOT/daemon_builder
+source $STORAGE_ROOT/daemon_builder/conf/info.sh
 
 RESULT=$(dialog --stdout --title "DaemonBuilder $VERSION" --menu "Choose an option" 16 60 9 \
     ' ' "- Install coin with Berkeley autogen file -" \

diff --git a/daemon_builder/utils/source.sh b/daemon_builder/utils/source.sh
diff --git a/install.sh b/install.sh
@@ -15,7 +15,7 @@
 #########################################################
 
 # Default version tag if not provided as environment variable
-TAG=${TAG:-v2.3.1}
+TAG=${TAG:-v2.3.2}
 
 # File paths
 YIIMPOOL_VERSION_FILE="/etc/yiimpoolversion.conf"

diff --git a/install/create_user.sh b/install/create_user.sh
@@ -144,6 +144,7 @@ if [[ ("$UsingSSH" == "yes") ]]; then
     echo
     echo -e "$RED Please reboot the system and log in as$GREEN ${yiimpadmin} $YELLOW and type$GREEN yiimpool$YELLOW to$GREEN continu$YELLOW setup...$NC"
     exit 0
+    ask_reboot
 fi
 
 # New User Password Login Creation
@@ -260,6 +261,7 @@ case $response in
     echo
     echo -e "$RED Please reboot the system and log in as:$GREEN ${yiimpadmin} $YELLOW and type$GREEN yiimpool$YELLOW to$GREEN continu$YELLOW setup...$NC"
     exit 0
+    ask_reboot
     ;;
 
 1)

diff --git a/install/functions.sh b/install/functions.sh
@@ -91,6 +91,14 @@ function install_end_message() {
 
 }
 
+# A function to ask if the user wants to reboot the system
+function ask_reboot() {
+  read -p "Do you want to reboot the system? (y/n): " reboot_choice
+  if [[ "$reboot_choice" == "y" ]]; then
+    sudo reboot
+  fi
+}
+
 function term_art() {
   clear
 

diff --git a/ver.sh b/ver.sh
@@ -9,7 +9,7 @@
 #########################################################
 
 if [ -z "${TAG}" ]; then
-	TAG=v2.3.1
+	TAG=v2.3.2
 fi
 
 echo 'VERSION='"${TAG}"'' | sudo -E tee /etc/yiimpoolversion.conf >/dev/null 2>&1
diff --git a/yiimp_single/start.sh b/yiimp_single/start.sh
@@ -33,7 +33,10 @@ if [ ! -d $STORAGE_ROOT/yiimp/yiimp_setup ]; then
     sudo mkdir -p $STORAGE_ROOT/{wallets,yiimp/{yiimp_setup/log,site/{web,stratum,configuration,crons,log},starts}}
     sudo touch $STORAGE_ROOT/yiimp/yiimp_setup/log/installer.log
 fi
-echo
+
+if [[ "$DISTRO" == "24" || "$DISTRO" == "23" || "$DISTRO" == "22" ]]; then
+    sudo chmod 755 /home/crypto-data/
+fi
 
 # Start the installation.
 source menu.sh
@@ -108,10 +111,7 @@ print_message() {
 }
 
 term_yiimpool
-
-# Call print_message regardless of UsingDomain
 print_message
-
 exit 0
-
+ask_reboot