Browse Source

update 2.2

Votre Nom 2 years ago
parent
commit
6bfa63581e
4 changed files with 87 additions and 13 deletions
  1. 1 0
      options/.gitignore
  2. 6 8
      options/build_gerbera.sh
  3. 44 5
      options/chia.sh
  4. 36 0
      options/john.sh

+ 1 - 0
options/.gitignore

@@ -0,0 +1 @@
+gerbera

+ 6 - 8
options/build_gerbera.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-Version=2.0
+Version=2.2
 function print_centered {
      [[ $# == 0 ]] && return 1
 
@@ -65,20 +65,18 @@ fi
 sleep 2
 
 git clone https://github.com/gerbera/gerbera.git
-
-cd ~/Build_Cube/options/gerbera/scripts
-sudo ./install-duktape.sh
 cd ~/Build_Cube/options/gerbera/scripts
-sudo ./install-lastfm.sh
+sudo ./install-pupnp.sh
 cd ~/Build_Cube/options/gerbera/scripts
 sudo ./install-fmt.sh
 cd ~/Build_Cube/options/gerbera/scripts
-sudo ./install-pugixml.sh
+sudo ./install-spdlog.sh
 cd ~/Build_Cube/options/gerbera/scripts
-sudo ./install-pupnp.sh
+sudo ./install-duktape.sh
 cd ~/Build_Cube/options/gerbera/scripts
-sudo ./install-spdlog.sh
+sudo ./install-lastfm.sh
 cd ~/Build_Cube/options/gerbera/scripts
+sudo ./install-pugixml.sh
 
 sed -i -e "s/rm -R taglib-build/rm -R taglib-build ||true/g" install-taglib.sh
 sudo ./install-taglib.sh

+ 44 - 5
options/chia.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
-Version=2.0
+Version=2.2
+Gui=no #YES for gui build
 function print_centered {
      [[ $# == 0 ]] && return 1
 
@@ -32,6 +33,11 @@ print_centered "|   ---|     ||  ||  _  |"
 print_centered "|______|__|__||__||___._|"
 echo -n "$(tput setaf 7)"
 print_centered "Toolkit for Chia v$Version"
+if [ $Gui = "YES" ]
+then
+echo -n "$(tput setaf 7)"
+print_centered "(Gui / wallet enabled)"
+fi
 print_centered "$(tput setaf 7)"
 sleep 3
 echo -e "$(tput setaf 2)\nUpdate and install packages:$(tput sgr0)"
@@ -41,20 +47,38 @@ echo -e "\e[97mDone.\e[0m"
 echo -e "$(tput setaf 2)\nDownload pack:$(tput sgr0)"
 ./download_pack.sh
 
-
 echo -e "$(tput setaf 2)\nBuild Chia-Miner:$(tput sgr0)"
 cp ../pack/chia-miner.tar.xz /home/wareck/
 cd /home/wareck
 tar xvfJ chia-miner.tar.xz
 rm chia-miner.tar.xz
-sudo cp chia-miner/chia-miner /etc/init.d/
+cat <<'EOF'>> chia-miner.sh
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides:          chiaminer
+# Required-Start:    networking
+# Default-Start:     3 4 5
+# Default-Stop:      0 6
+### END INIT INFO
+cd /home/wareck/chia-miner/
+su wareck -c "screen -dmS chia-miner /home/wareck/chia-miner/hpool-miner-chia -config /home/wareck/chia-miner/config.yaml"
+exit 0
+EOF
+chmod +x chia-miner.sh
+sudo cp chia-miner.sh /etc/init.d/chia-miner
 sudo update-rc.d chia-miner defaults
-sudo rm /home/wareck/chia-miner/chia-miner
+sudo rm chia-miner.sh
 echo -e "\e[97mDone.\e[0m"
 
 echo -e "$(tput setaf 2)\nBuild Chia-Plotter (MadMax) :$(tput sgr0)"
 cd /home/wareck
+if [ ! -d chia-plotter ]
+then
 git clone https://github.com/madMAx43v3r/chia-plotter.git
+else
+cd /home/wareck/chia-plotter
+git pull
+fi
 cd /home/wareck/chia-plotter
 git submodule init
 git submodule update
@@ -75,20 +99,35 @@ echo -e "\e[97mDone.\e[0m"
 
 echo -e "$(tput setaf 2)\nBuild Chia-Pos:$(tput sgr0)"
 cd /home/wareck/
+if [ ! -d  /home/wareck/chia-pos ]
+then
 git clone https://github.com/Chia-Network/chiapos.git chia-pos
 cd /home/wareck/chia-pos
-mkdir build
+else
+cd /home/wareck/chia-pos
+git pull
+fi
+if [ ! -d build ]; then mkdir build;fi
 cd build
 cmake ..
 make -j4
 echo -e "\e[97mDone.\e[0m"
 
+if [ $Gui = "YES" ]
+then
 echo -e "$(tput setaf 2)\nBuild Chia-Gui :$(tput sgr0)"
 cd /home/wareck
+if [ ! -d  /home/wareck/chia-pos ]
+then
 git clone https://github.com/Chia-Network/chia-blockchain.git -b latest --recurse-submodules
 cd chia-blockchain
+else
+cd chia-blockchain
+git pull
+fi
 sh install.sh
 source ./activate
 sh install-gui.sh
+fi
 
 echo -e "\n\e[97mEnd of process...\e[0m"

+ 36 - 0
options/john.sh

@@ -1,4 +1,40 @@
 #!/bin/bash
+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
+}
+
+print_centered "$(tput setaf 1)"
+print_centered ".________ ._______  .___.__  .______ "
+print_centered ":____.   \: .___  \ :   |  \ :      \ "
+print_centered " __|  :/ || :   |  ||   :   ||       |"
+print_centered "|     :  ||     :  ||   .   ||   |   |"
+print_centered " \__. __/  \_. ___/ |___|   ||___|   |"
+print_centered "    :/       :/         |___|    |___|"
+print_centered "    :        :                        "
+print_centered "                 "
+print_centered "$(tput setaf 7)"
+
+
 sudo apt-get install libbz2-dev libpcap-dev -y
 sudo apt-get -y install ocl-icd-opencl-dev opencl-headers pocl-opencl-icd
 cd /home/wareck/