Votre Nom 2 years ago
parent
commit
485c2e9114
2 changed files with 15 additions and 34 deletions
  1. 12 31
      build_cube.sh
  2. 3 3
      options/chia.sh

+ 12 - 31
build_cube.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-Version=5.2
+Version=5.4
 Cuda=NO
 ZFS=NO
 Drivers=AMD
@@ -107,8 +107,11 @@ then
 		sudo bash -c "echo options nouveau modeset=0 >> /etc/modprobe.d/blacklist-nvidia-nouveau.conf"
 		sudo update-initramfs -u
 		touch /home/wareck/.pass1
+	if [ $Drivers = "NVIDIA" ]
+	then
 		decompte_
 	fi
+	fi
 	touch ~/.pass1
 fi
 
@@ -130,26 +133,6 @@ NVIDIA)
                 touch /home/wareck/.pass2
                 decompte_
 ;;
-#82)
-#	echo -e "$(tput setaf 10)\nInstall NVIDIA GT710 Drivers 470.$Drivers :$(tput sgr0)"
-#	if ! [ -f NVIDIA-Linux-x86_64-470.82.00.run ]
-#	then
-#	        cd /home/wareck/
-#		echo -e "Download MegaDownload:"
-#	        git clone https://github.com/wareck/megadown.git
-#	        sudo cp /home/wareck/megadown/megadown /usr/local/bin/megadown
-#	        sudo rm -r /home/wareck/megadown
-#	        cd /home/wareck
-#               echo -e ""
-#                echo -e "Download drivers:"
-#	        megadown https://mega.nz/file/T8gSjQ5I#-Dx3XXMebc9cRu6VsgV4jkzWUcA-66Yxf025nN0TTf8
-#	        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
-#	        sudo apt-get install nvidia-driver-470
-#		decompte_
-#	fi
-#;;
 AMD)
 		echo -e "$(tput setaf 10)\nInstall AMD Drivers :$(tput sgr0)"
                 cd /home/wareck
@@ -406,7 +389,7 @@ UUID=9c449ef0-1008-422c-9105-87342e9c9072 /media/Raid ext4
 UUID=1df72b63-fca0-45c6-992c-3e2532d5591a /media/Store ext4
 UUID=27821afb-02ed-4b13-8b61-5980787b4ad1 /media/Partage ext4
 #btrfs
-UUID=3c48d278-076c-4904-a280-4582c6bf8b24 /media/Nvme btrfs ssd,nodatacow,discard=async,noatime
+UUID=UUID=94e5d6b2-a857-41e9-9121-cf489678fedb /media/Nvme btrfs ssd,nodatacow,discard=async,noatime
 #external drive
 #UUID=5C8687930F62EE79 /media/Chia ntfs auto,nofail,noatime,rw,user    0   0
 EOF
@@ -528,7 +511,7 @@ fi
 function cleaning_ {
 if [ -f /home/wareck/.pass4 ]
 then
-echo -e "$(tput setaf 10)\nCleaning:$(tput sgr0)"
+echo -e "$(tput setaf 10)\nCleaning install files:$(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
 if [ -f /home/wareck/pack2.tar.xz ]; then rm /home/wareck/pack2.tar.xz ;fi
@@ -544,20 +527,19 @@ if [ -f /home/wareck/.pass1 ]; then rm /home/wareck/.pass1 ;fi
 if [ -f /home/wareck/.pass2 ]; then rm /home/wareck/.pass2 ;fi
 if [ -f /home/wareck/.pass3 ]; then rm /home/wareck/.pass3 ;fi
 if [ -f /home/wareck/.pass4 ]; then rm /home/wareck/.pass4 ;fi
-rm /home/wareck/.config/autostart/install_os.desktop
-rm -r -f /home/wareck/.config/autostart
-sudo apt-get update
-sudo apt-get upgrade -y
-sudo apt-get autoremove -y
-echo "Done."
+if [ -f home/wareck/.config/autostart/install_os.desktop ];then rm /home/wareck/.config/autostart/install_os.desktop;fi
+cd pack
+./clean.sh
+echo -e "Done. \n"
 echo `date` "install/update" >/home/wareck/.buildcube
 fi
+sudo apt-get autoremove -y
 }
 
 function autoroot_ {
 if [ ! -d /home/wareck/.config/autostart ]
 then
-echo -e "$(tput setaf 10)\nInit install & autostart :$(tput sgr0)"
+echo -n -e "$(tput setaf 10)\nInit install & autostart$(tput sgr0)"
 mkdir /home/wareck/.config/autostart
 fi
 if [ ! -f /home/wareck/.config/autostart/install_os.desktop ]
@@ -592,7 +574,6 @@ fi
 if ! grep "wareck" /etc/sudoers >/dev/null
 then
 sudo sh -c "echo \"wareck ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers"
-echo "Done"
 fi
 }
 

+ 3 - 3
options/chia.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-Version=2.2
+Version=2.3
 Gui=no #YES for gui build
 function print_centered {
      [[ $# == 0 ]] && return 1
@@ -86,13 +86,13 @@ git submodule update
 cd build
 cat <<'EOF'>> go.sh
 #!/bin/bash
-./chia_plot -n 1 -r 4 -u 128 -t /media/nvme/ -2 /media/Partage/temp/ -d /media/Partage/Plots/ -p a99e72c49c5ed39bf793caab9e074a80dd61011a859e975842874aab47b783f9ce84282febe2ca275c0930149b67990a -f 8ba5acd276b45fd0f749ce195dcddcf0e63c3bf2e751e9e273faa0125075c36a11f2ee231e7cf74abed2920be97fc373
+./chia_plot -n 1 -r 4 -u 128 -t /media/Nvme/ -2 /media/Nvme/ -d /media/Partage/Plots/ -p a99e72c49c5ed39bf793caab9e074a80dd61011a859e975842874aab47b783f9ce84282febe2ca275c0930149b67990a -f 8ba5acd276b45fd0f749ce195dcddcf0e63c3bf2e751e9e273faa0125075c36a11f2ee231e7cf74abed2920be97fc373
 EOF
 chmod +x go.sh
 
 cat <<'EOF'>> nft.sh
 #!/bin/bash
-./chia_plot -n 1 -r 4 -u 128 -t /media/nvme/ -2 /media/ssd_ext/ -d /media/Partage/Plots-nft/ -c xch18c2jp56msc47yzww25wcnzz5fk9y268zl3zh357kftsp0n7l6m8scyqg4e -f 8ba5acd276b45fd0f749ce195dcddcf0e63c3bf2e751e9e273faa0125075c36a11f2ee231e7cf74abed2920be97fc373
+./chia_plot -n 1 -r 4 -u 128 -t /media/Nvme/ -2 /media/Nvme/ -d /media/Partage/Plots-nft/ -c xch18c2jp56msc47yzww25wcnzz5fk9y268zl3zh357kftsp0n7l6m8scyqg4e -f 8ba5acd276b45fd0f749ce195dcddcf0e63c3bf2e751e9e273faa0125075c36a11f2ee231e7cf74abed2920be97fc373
 EOF
 chmod +x nft.sh
 echo -e "\e[97mDone.\e[0m"