more path issues

db.sh

@@ -5,7 +5,9 @@
 source /etc/functions.sh
 source $STORAGE_ROOT/yiimp/.yiimp.conf
 source $HOME/multipool/yiimp_single/.wireguard.install.cnf
+if [[ ("$wireguard" == "true") ]]; then
 source $STORAGE_ROOT/yiimp/.wireguard.conf
+fi
 
 echo Installing MariaDB...
 MARIADB_VERSION='10.3'
@@ -97,15 +99,12 @@ sudo mysql -u root -p"${DBRootPassword}" yiimpfrontend --force < 2018-02-coins_g
 sudo mysql -u root -p"${DBRootPassword}" yiimpfrontend --force < 2019-03-coins_thepool_life.sql
 
 if [[ ("$wireguard" == "false") ]]; then
-
 sudo sed -i '/max_connections/c\max_connections         = 800' /etc/mysql/my.cnf
 sudo sed -i '/thread_cache_size/c\thread_cache_size       = 512' /etc/mysql/my.cnf
 sudo sed -i '/tmp_table_size/c\tmp_table_size          = 128M' /etc/mysql/my.cnf
 sudo sed -i '/max_heap_table_size/c\max_heap_table_size     = 128M' /etc/mysql/my.cnf
 sudo sed -i '/wait_timeout/c\wait_timeout            = 60' /etc/mysql/my.cnf
 sudo sed -i '/max_allowed_packet/c\max_allowed_packet      = 64M' /etc/mysql/my.cnf
-
-
 else
   sudo sed -i '/max_connections/c\max_connections         = 800' /etc/mysql/my.cnf
   sudo sed -i '/thread_cache_size/c\thread_cache_size       = 512' /etc/mysql/my.cnf

first_boot.sh

@@ -54,4 +54,3 @@ sudo chmod 777 $STORAGE_ROOT/yiimp/site/log/debug.log
 # Delete me no longer needed after it runs the first time
 
 sudo rm -r $STORAGE_ROOT/yiimp/first_boot.sh
-cd $HOME/multipool/yiimp_single

motd.sh

@@ -29,4 +29,3 @@ run-parts /etc/update-motd.d/ | sudo tee /etc/motd
 ' | sudo -E tee /usr/bin/motd >/dev/null 2>&1
 
 sudo chmod +x /usr/bin/motd
-cd $HOME/multipool/yiimp_single

nginx_upgrade.sh

@@ -23,4 +23,3 @@ sudo cp -r nginx_confs/nginx.conf /etc/nginx/
 
 restart_service nginx
 restart_service php7.2-fpm
-cd $HOME/multipool/yiimp_single

questions.sh

@@ -6,6 +6,9 @@
 source /etc/functions.sh
 source /etc/multipool.conf
 source $HOME/multipool/yiimp_single/.wireguard.install.cnf
+if [[ ("$wireguard" == "true") ]]; then
+source $STORAGE_ROOT/yiimp/.wireguard.conf
+fi
 
 message_box "Ultimate Crypto-Server Setup Installer v1.02" \
 "You have choosen to install YiiMP Single Server!

send_mail.sh

@@ -27,4 +27,3 @@ sudo sed -i '/root:/a '$whoami':     '${SupportEmail}'' /etc/aliases
 sudo newaliases
 
 sudo adduser $whoami mail
-cd $HOME/multipool/yiimp_single

server_harden.sh

@@ -26,4 +26,3 @@ echo 'net.ipv4.tcp_no_metrics_save = 1' | hide_output sudo tee -a /etc/sysctl.co
 echo 'net.core.netdev_max_backlog = 5000' | hide_output sudo tee -a /etc/sysctl.conf
 
 echo Tuning complete...
-cd $HOME/multipool/yiimp_single

system.sh

@@ -7,6 +7,9 @@ clear
 source /etc/functions.sh
 source $STORAGE_ROOT/yiimp/.yiimp.conf
 source $HOME/multipool/yiimp_single/.wireguard.install.cnf
+if [[ ("$wireguard" == "true") ]]; then
+source $STORAGE_ROOT/yiimp/.wireguard.conf
+fi
 
 # Set timezone
 echo Setting TimeZone to UTC...

web.sh

@@ -7,9 +7,11 @@
 
 source /etc/functions.sh
 source /etc/multipool.conf
+source $STORAGE_ROOT/yiimp/.yiimp.conf
 source $HOME/multipool/yiimp_single/.wireguard.install.cnf
+if [[ ("$wireguard" == "true") ]]; then
 source $STORAGE_ROOT/yiimp/.wireguard.conf
-source $STORAGE_ROOT/yiimp/.yiimp.conf
+fi
 
 echo Building web file structure and copying files...
 cd $STORAGE_ROOT/yiimp/yiimp_setup/yiimp