update

build_cube.sh

@@ -35,7 +35,7 @@ function print_centered {
      return 0
 }
 
-function intro {
+function intro_ {
 print_centered "$(tput setaf 5)"
 print_centered " ██████╗██╗   ██╗██████╗ ███████╗"
 print_centered "██╔════╝██║   ██║██╔══██╗██╔════╝"
@@ -72,7 +72,7 @@ echo -e "Done."
 fi
 }
 
-function decompte {
+function decompte_ {
 echo -e "$(tput setaf 10)\nReboot in 10 seconds (CRTL+C to abord):$(tput sgr0)"
 for i in {10..1}
 do
@@ -83,7 +83,7 @@ echo ""
 sudo reboot
 }
 
-function nvidia_driver {
+function nvidia_driver_ {
 if [ ! -f /home/wareck/.pass1 ] && [ ! -f /home/wareck/.pass2 ]
 then
 echo -e "$(tput setaf 10)\nInstall NVIDIA GT710 Drivers:$(tput sgr0)"
@@ -101,7 +101,7 @@ then
 		sudo bash -c "echo options nouveau modeset=0 >> /etc/modprobe.d/blacklist-nvidia-nouveau.conf"
 		sudo update-initramfs -u
 		touch /home/wareck/.pass1
-		decompte
+		decompte_
 	fi
 	touch ~/.pass1
 fi
@@ -130,7 +130,7 @@ case $Drivers in
         	chmod +X NVIDIA-Linux-x86_64-470.74.run
 		sudo bash /home/wareck/NVIDIA-Linux-x86_64-470.74.run
 		touch /home/wareck/.pass2
-		decompte
+		decompte_
 	fi
 ;;
 82)
@@ -148,7 +148,7 @@ case $Drivers in
 	        chmod +X NVIDIA-Linux-x86_64-470.82.00.run
 	        sudo bash /home/wareck/NVIDIA-Linux-x86_64-470.82.00.run
 	        touch /home/wareck/.pass2
-	        decompte
+	        decompte_
 	fi
 ;;
 *)
@@ -159,7 +159,7 @@ esac
 fi
 }
 
-function download_packs {
+function download_packs_ {
 echo -e "$(tput setaf 10)\nDownload complement packs:$(tput sgr0)"
 wget -c -q --show-progress http://folivier.homelinux.org/cube/pack/cgminer.conf -O pack/cgminer.conf
 wget -c -q --show-progress http://folivier.homelinux.org/cube/pack/chia-miner.tar.xz -O pack/chia-miner.tar.xz
@@ -207,7 +207,7 @@ fi
 echo -e ""
 }
 
-function build_miners {
+function build_miners_ {
 cd /home/wareck/
 echo -e "$(tput setaf 10)Build Cgminer-gekko:$(tput sgr0)"
 if ! [ -d cgminer-gekko ]
@@ -314,8 +314,6 @@ su wareck -c 'gsettings set org.gnome.shell.extensions.dash-to-dock dash-max-ico
 #su wareck -c 'gsettings set org.gnome.shell.extensions.dash-to-dock show-mounts false'
 sleep 0.5
 
-
-
 sudo rm -r -f /etc/update-motd.d/*
 tar xfJ pack1.tar.xz --checkpoint=.10
 echo -n -e "\n"
@@ -359,18 +357,6 @@ sudo cp /tmp/fstab /etc/fstab
 fi
 echo "Done."
 
-if [ $ZFS = "YES" ]
-then
-sudo zpool import Raid
-fi
-
-sudo mount /media/Store
-sudo mount /media/Partage
-sudo chmod 777 /media/Store
-sudo chmod 777 /media/Partage
-sudo chmod 777 /media/nvme
-sudo chmod 777 /media/Nas
-
 echo -e "$(tput setaf 10)\nSensors drivers:$(tput sgr0)"
 if ! grep "nct6775" /etc/modules >/dev/null
 then
@@ -442,7 +428,22 @@ echo "Done."
 fi
 }
 
-function cleaning {
+function mounting_drives_ {
+echo -e "$(tput setaf 10)\nMountingr Drives$(tput sgr0)"
+if [ $ZFS = "YES" ]
+then
+sudo zpool import Raid | true
+fi
+sudo mount /media/Store
+sudo mount /media/Partage
+sudo chmod 777 /media/Store
+sudo chmod 777 /media/Partage
+sudo chmod 777 /media/nvme
+sudo chmod 777 /media/Nas
+echo "Done."
+}
+
+function cleaning_ {
 echo -e "$(tput setaf 10)\nCleaning:$(tput sgr0)"
 if [ -f /pack2.tar.xz ]; then sudo rm /pack2.tar.xz ;fi
 if [ -f /home/wareck/pack1.tar.xz ]; then rm /home/wareck/pack1.tar.xz ;fi
@@ -464,14 +465,15 @@ echo "Done."
 #tightvncserver
 #echo "Done."
 
-intro
-nvidia_driver
+intro_
+nvidia_driver_
 update_
-download_packs
-build_miners
+download_packs_
 printer_
+build_miners_
 configure_
-cleaning
+mounting_drives_
+cleaning_
 
 su wareck -c 'gsettings set org.gnome.shell.extensions.dash-to-dock dash-max-icon-size 32'
 sleep 0.5