Votre Nom 1 year ago
parent
commit
3b04315752
2 changed files with 19 additions and 143 deletions
  1. 19 16
      options/chia.sh
  2. 0 127
      options/flexfarmer.sh

+ 19 - 16
options/chia.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 #set -e
-Version=6.0.0
+Version=6.0.1
 
-Gui=Yes #can be Yes No or Only
+Gui=No #can be Yes No or Only
 GigaHorse_farmer=Yes
 
 MadMax=Yes
@@ -91,9 +91,13 @@ then
 fi
 case $Gui in
 YES)
-	echo -n "$(tput setaf 41)"
+	echo -n "$(tput setaf 40)"
 	print_centered "Blockchain wallet + Gui"
 	echo -n "$(tput sgr0)"
+        echo -n "$(tput setaf 11)"
+        print_centered "Chia Plotting Tools"
+        echo -n "$(tput sgr0)"
+
 	;;
 NO)
         echo -n "$(tput setaf 11)"
@@ -117,7 +121,7 @@ if [ $Gui = "NO" ] || [ $Gui = "YES" ]
 then
 case $GigaHorse_farmer in
 YES)
-        echo -n "$(tput setaf 43)"
+        echo -n "$(tput setaf 42)"
 	print_centered "GigaHorse Farmer"
 	echo -n "$(tput sgr0)"
 	;;
@@ -131,15 +135,15 @@ YES)
 esac
 case $H9_ChiaProxy in
 YES)
-	echo -n "$(tput setaf 44)"
+	echo -n "$(tput setaf 43)"
         print_centered "Hpool x-Proxy Enabled"
 	echo -n "$(tput sgr0)"
         ;;
 esac
 case $FoxyPool in
 YES)
-        echo -n "$(tput setaf 166)"
-        print_centered "FoxyPool Enabled"
+        echo -n "$(tput setaf 44)"
+        print_centered "FoxyPool"
         echo -n "$(tput sgr0)"
 	;;
 esac
@@ -201,7 +205,6 @@ OUT=/media/Partage/Plots-nft/
 ./chia_plot -p $POOL -f $FARM -n 1 -r 4 -u 128 -t /nvme0/plotting/ -2 /nvme1/plotting/ -d $OUT
 EOF
 chmod +x nft.sh
-echo -e "\e[97mDone.\e[0m"
 
 if [ -f foxy.sh ];then rm foxy.sh; fi
 cat <<'EOF'>> foxy.sh
@@ -278,6 +281,7 @@ fi
 echo "generate bash files..."
 sudo cp ~/chia/chia-gigahorse/plot-sink/linux/x86_64/* /usr/local/bin/
 sudo cp ~/chia/chia-gigahorse/cpu-plotter/linux/x86_64/* /usr/local/bin/
+sudo cp ~/chia/chia-gigahorse/chiapos/linux/x86_64/ProofOfSpace /usr/local/bin/
 cd ~
 if [ -f distrib_chia.sh ];then sudo rm distrib_chia.sh;fi
 if [ -f /usr/local/bin/distrib_chia.sh ];then sudo rm /usr/local/bin/distrib_chia.sh;fi
@@ -489,7 +493,7 @@ CTR=xch1f5y47t9jhkthq4fktq5md2d7wz3ruwdsnqah9ym8k3dd0ll2gheqh7l785
 FPK=8ba5acd276b45fd0f749ce195dcddcf0e63c3bf2e751e9e273faa0125075c36a11f2ee231e7cf74abed2920be97fc373
 OUT=@192.168.1.100
 ./cuda_plot_k32 -g 0 -c $CTR -f $FPK -C 17 -n 1 -t /raid/plotting/ -3 /raid/plotting/ -d $OUT
-#/home/wareck/chia/chia-gigahorse/chiapos/linux/x86_64/ProofOfSpace farm -t 8 -d 100 -f $OUT
+ProofOfSpace farm -t 8 -d 100 -f $OUT
 EOF
 chmod +x foxypool.sh
 mv foxypool.sh /home/wareck/chia/chia-gigahorse/cuda-plotter/linux/x86_64/foxypool.sh
@@ -574,17 +578,16 @@ ONLY)
 *)
 
 if [ $GigaHorse = "YES" ];then gigahorse;fi
-if [ $GigaHorse_farmer = "YES" ];then GigaHorse_farmer_;fi
-if [ $FoxyPool = "YES" ]; then foxypool_;fi
-exit
 if [ $MadMax = "YES" ];then chia_plotter;fi
 if [ $BladeBit = "YES" ];then bladebit;fi
 if [ $ChiaPos = "YES" ];then chiapos;fi
-if [ $Miner = "YES" ];then miner_;fi
-if [ $ChiaService = "YES" ];then service_;fi
-if [ $ChiaProxy = "YES" ]; then chia_proxy;fi
-if [ $Gui = "YES" ]; then chia_blockchain;fi
+if [ $H9_Miner = "YES" ];then miner_;fi
+if [ $H9_ChiaService = "YES" ];then service_;fi
+if [ $H9_ChiaProxy = "YES" ]; then chia_proxy;fi
 if [ $FoxyPool = "YES" ]; then foxypool_;fi
+if [ $GigaHorse_farmer = "YES" ];then GigaHorse_farmer_;fi
+if [ $Gui = "YES" ]; then chia_blockchain;fi
+
 	 ;;
 esac
 

+ 0 - 127
options/flexfarmer.sh

@@ -1,127 +0,0 @@
-#!/bin/bash
-set -e
-version=2.1
-function print_centered {
-     [[ $# == 0 ]] && return 1
-
-     declare -i TERM_COLS="$(tput cols)"
-     declare -i str_len="${#1}"
-     [[ $str_len -ge $TERM_COLS ]] && {
-          echo "$1";
-          return 0;
-     }
-
-     declare -i filler_len="$(( (TERM_COLS - str_len) / 2 ))"
-     [[ $# -ge 2 ]] && ch="${2:0:1}" || ch=" "
-     filler=""
-     for (( i = 0; i < filler_len; i++ )); do
-          filler="${filler}${ch}"
-     done
-
-     printf "%s%s%s" "$filler" "$1" "$filler"
-     [[ $(( (TERM_COLS - str_len) % 2 )) -ne 0 ]] && printf "%s" "${ch}"
-     printf "\n"
-
-     return 0
-}
-if [ ! -d /home/wareck/chia ]
-then
-echo "Flexfarmer v$version installer"
-echo "Install chia first..."
-exit
-fi
-
-print_centered "$(tput setaf 10)"
-print_centered " _____ _         ___                       "
-print_centered "|   __| |___ _ _|  _|___ ___ _____ ___ ___ "
-print_centered "|   __| | -_|_'_|  _| .'|  _|     | -_|  _|"
-print_centered "|__|  |_|___|_,_|_| |__,|_| |_|_|_|___|_|  "
-print_centered "                                           "
-echo -n "$(tput sgr0)"
-print_centered "Flexpool mining software"
-
-function build_service {
-cat > $HOME/flexfarmer.service << EOF
-# The flexfarmer service (part of systemd)
-# file: /etc/systemd/system/flexfarmer.service
-
-[Unit]
-Description     = FlexFarmer Service
-After=network.target
-
-[Service]
-Type=simple
-User            = $USER
-WorkingDirectory= $HOME/flexfarmer
-ExecStart       = $HOME/flexfarmer/flexfarmer -c $HOME/flexfarmer/config.yml
-Restart         = on-failure
-RestartSec=30
-LimitNOFILE=99999
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=flexfarmer
-
-
-[Install]
-WantedBy    = multi-user.target
-EOF
-sudo mv $HOME/flexfarmer.service /etc/systemd/system/flexfarmer.service  >/dev/null
-sudo chmod 644 /etc/systemd/system/flexfarmer.service
-
-cat <<'EOF'>> flexfarmer.conf
-if $programname == 'flexfarmer' then /var/log/flexfarmer.log
-& stop
-EOF
-sudo cp flexfarmer.conf /etc/rsyslog.d/flexfarmer.conf
-sudo rm flexfarmer.conf
-if [ ! -f /var/log/flexfarmer.log ]
-then
-sudo touch /var/log/flexfarmer.log
-sudo chown syslog:adm /var/log/flexfarmer.log
-fi
-cat <<'EOF'>> logrot
-/var/log/flexfarmer.log {
-    daily
-    rotate 7
-    copytruncate
-    notifempty
-    missingok
-    su root syslog
-}
-EOF
-sudo cp logrot /etc/logrotate.d/flexfarmer
-sudo rm logrot
-print_centered "Install service : [ OK ]"
-}
-
-
-function install_ {
-cd /home/wareck/
-wget -c -q http://folivier.homelinux.org/cube/pack/flexfarmer.tar.xz
-tar xfJ flexfarmer.tar.xz
-rm /home/wareck/flexfarmer.tar.xz
-sudo cp /home/wareck/flexfarmer/flexfarmer /usr/local/bin/
-print_centered "Install software : [ OK ]"
-}
-
-function nft_builder {
-if [ -f /home/wareck/chia/chia-plotter/build/flexpool.sh ];then rm /home/wareck/chia/chia-plotter/build/flexpool.sh;fi
-if [ ! -d /home/wareck/chia/chia-plotter/build/ ]; then mkdir -p /home/wareck/chia/chia-plotter/build/ ;fi
-cat <<'EOF'>> /home/wareck/chia/chia-plotter/build/flexpool.sh
-#!/bin/bash
-./chia_plot -n 1 -r 6 -u 128 -t /media/nvme0/plotting/ -2 /media/nvme1/plotting/ -d /Chia/Chia2/Plots-nft/ -c xch10yjksfwm8s66z32qy35x950608hk8l67vmsur4rwpaanpkd6ks3qhfw5nk -f 8ba5acd276b45fd0f749ce195dcddcf0e63c3bf2e751e9e273faa0125075c36a11f2ee231e7cf74abed2920be97fc373
-EOF
-chmod +x /home/wareck/chia/chia-plotter/build/flexpool.sh
-print_centered "Install nft script : [ OK ]"
-}
-
-echo
-install_
-build_service
-nft_builder
-sudo systemctl restart rsyslog >/dev/null 2>&1
-sudo systemctl daemon-reload >/dev/null 2>&1
-sudo systemctl enable flexfarmer >/dev/null 2>&1
-sudo systemctl start flexfarmer >/dev/null 2>&1
-#sudo systemctl status flexfarmer
-echo