wareck il y a 1 an
Parent
commit
7706cd882e
7 fichiers modifiés avec 22 ajouts et 22 suppressions
  1. 4 4
      build_cube.sh
  2. 1 1
      options/build_gerbera.sh
  3. 4 4
      options/chia.sh
  4. 1 1
      options/flexfarmer.sh
  5. 9 9
      options/minecraft.sh
  6. 2 2
      options/password.sh
  7. 1 1
      options/watchdog.sh

+ 4 - 4
build_cube.sh

@@ -10,7 +10,7 @@ Webmin="webmin-2.021"
 kernel_dkms="5.15.0-69-generic"
 kernel_dkms="5.15.0-69-generic"
 
 
 if (( $EUID != 0 )); then
 if (( $EUID != 0 )); then
-   echo -e "$(tput setaf 9)This must be run as root. Try 'sudo $0'.$(tput setaf 7)"
+   echo -e "$(tput setaf 9)This must be run as root. Try 'sudo $0'.$(tput sgr0)"
    exit 1
    exit 1
 fi
 fi
 clear
 clear
@@ -35,7 +35,7 @@ case $kernel_custom in
 NO)
 NO)
 	if [[ "$unamestr" == '5.15.0-69-generic' ]]
 	if [[ "$unamestr" == '5.15.0-69-generic' ]]
 	then
 	then
-	echo -e "$(tput setaf 10)DKMS Kernel install :$(tput setaf 7)"
+	echo -e "$(tput setaf 10)DKMS Kernel install :$(tput sgr0)"
 	sudo rm /boot/config-5.15*
 	sudo rm /boot/config-5.15*
 	sudo rm /boot/initrd.img-5.15*
 	sudo rm /boot/initrd.img-5.15*
 	sudo rm /boot/System.map-5.15*
 	sudo rm /boot/System.map-5.15*
@@ -64,7 +64,7 @@ YES)
 
 
 	if ! [[ "$unamestr" == $KLversion ]]
 	if ! [[ "$unamestr" == $KLversion ]]
 	then
 	then
-	echo -e "$(tput setaf 7)Custom kernel install $Kversion(fixed DKMS and WOL) :$(tput setaf 7)"
+	echo -e "$(tput setaf 15)Custom kernel install $(tput setaf 5)$KLversion $(tput setaf 15) (fixed DKMS and WOL) :$(tput sgr0)"
 	cd /tmp/
 	cd /tmp/
 	#wget -c -q --show-progress http://folivier.homelinux.org/cube/pack/custom_kernel.tar.xz
 	#wget -c -q --show-progress http://folivier.homelinux.org/cube/pack/custom_kernel.tar.xz
 	wget -c -q --show-progress http://192.168.1.8:3000/wareck/custom_kernel/raw/master/$KHeader
 	wget -c -q --show-progress http://192.168.1.8:3000/wareck/custom_kernel/raw/master/$KHeader
@@ -114,7 +114,7 @@ print_centered "██║     ██║   ██║██████╔╝█
 print_centered "██║     ██║   ██║██╔══██╗██╔══╝  "
 print_centered "██║     ██║   ██║██╔══██╗██╔══╝  "
 print_centered "╚██████╗╚██████╔╝██████╔╝███████╗"
 print_centered "╚██████╗╚██████╔╝██████╔╝███████╗"
 print_centered " ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝"
 print_centered " ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝"
-echo -n "$(tput setaf 7)"
+echo -n "$(tput sgr0)"
 print_centered "Cube Server installation script v$Version"
 print_centered "Cube Server installation script v$Version"
 print_centered "Ubuntu version 20.04"
 print_centered "Ubuntu version 20.04"
 print_centered "FMA86-extreme4"
 print_centered "FMA86-extreme4"

+ 1 - 1
options/build_gerbera.sh

@@ -39,7 +39,7 @@ print_centered " / ___/__ ____/ /  ___ _______ _";
 print_centered "/ (_ / -_) __/ _ \/ -_) __/ _ \`/";
 print_centered "/ (_ / -_) __/ _ \/ -_) __/ _ \`/";
 print_centered "\___/\__/_/ /_.__/\__/_/  \_,_/ ";
 print_centered "\___/\__/_/ /_.__/\__/_/  \_,_/ ";
 print_centered "                                ";
 print_centered "                                ";
-echo -n "$(tput setaf 7)"
+echo -n "$(tput sgr0)"
 print_centered "Gerbera UPNP installation script v$Version"
 print_centered "Gerbera UPNP installation script v$Version"
 echo ""
 echo ""
 sleep 3
 sleep 3

+ 4 - 4
options/chia.sh

@@ -41,25 +41,25 @@ print_centered " ______ __     __        "
 print_centered "|      |  |--.|__|.---.-."
 print_centered "|      |  |--.|__|.---.-."
 print_centered "|   ---|     ||  ||  _  |"
 print_centered "|   ---|     ||  ||  _  |"
 print_centered "|______|__|__||__||___._|"
 print_centered "|______|__|__||__||___._|"
-echo -n "$(tput setaf 7)"
+echo -n "$(tput sgr0)"
 print_centered "Toolkit for Chia v$Version"
 print_centered "Toolkit for Chia v$Version"
 if [ $Gui = "Yes" ]
 if [ $Gui = "Yes" ]
 then
 then
 echo -n "$(tput setaf 3)"
 echo -n "$(tput setaf 3)"
 print_centered "Chia Gui + mining Enabled"
 print_centered "Chia Gui + mining Enabled"
-echo -n "$(tput setaf 7)"
+echo -n "$(tput sgr0)"
 fi
 fi
 if [ $Gui = "Only" ]
 if [ $Gui = "Only" ]
 then
 then
 echo -n "$(tput setaf 3)"
 echo -n "$(tput setaf 3)"
 print_centered "Chia blockchain Gui Only"
 print_centered "Chia blockchain Gui Only"
-echo -n "$(tput setaf 7)"
+echo -n "$(tput sgr0)"
 fi
 fi
 if [ $Gui = "No" ]
 if [ $Gui = "No" ]
 then
 then
 echo -n "$(tput setaf 3)"
 echo -n "$(tput setaf 3)"
 print_centered "Chia Mining Enabled"
 print_centered "Chia Mining Enabled"
-echo -n "$(tput setaf 7)"
+echo -n "$(tput sgr0)"
 fi
 fi
 
 
 sleep 3
 sleep 3

+ 1 - 1
options/flexfarmer.sh

@@ -31,7 +31,7 @@ print_centered "|   __| |___ _ _|  _|___ ___ _____ ___ ___ "
 print_centered "|   __| | -_|_'_|  _| .'|  _|     | -_|  _|"
 print_centered "|   __| | -_|_'_|  _| .'|  _|     | -_|  _|"
 print_centered "|__|  |_|___|_,_|_| |__,|_| |_|_|_|___|_|  "
 print_centered "|__|  |_|___|_,_|_| |__,|_| |_|_|_|___|_|  "
 print_centered "                                           "
 print_centered "                                           "
-echo -n "$(tput setaf 7)"
+echo -n "$(tput sgr0)"
 print_centered "Flexpool mining software"
 print_centered "Flexpool mining software"
 
 
 function build_service {
 function build_service {

+ 9 - 9
options/minecraft.sh

@@ -102,7 +102,7 @@ echo "Done"
 function recovery {
 function recovery {
 if [ $recover_backup = "YES" ]
 if [ $recover_backup = "YES" ]
 then
 then
-echo -e "\n$(tput setaf 10)Restore Backup:$(tput setaf 7)"
+echo -e "\n$(tput setaf 10)Restore Backup:$(tput sgr0)"
 if [ -r /home/wareck/temp_arc ]
 if [ -r /home/wareck/temp_arc ]
 then
 then
 rm -r /home/wareck/temp_arc
 rm -r /home/wareck/temp_arc
@@ -125,9 +125,9 @@ print_centered "⠀⢀⠃⠀⠀⠘⠛⠁⠀⠀⣼⠀⠀⣸⠃⠀⠀⠘⠃⠀⢰
 print_centered "⠀⡜⣀⢀⣶⣀⣰⠆⠀⢀⡏⠀⠀⣿⠀⠀⣸⣄⠤⠄⢸⠃⠀⢰⣶⣶⣶⣿⠀⠀⢸⣉⣉⣉⡇⡀⠀⣶⠀⠀⢹⠀⠀⢀⡀⢀⠀⣇⠀⠀⢶⣶⣶⢾⣿⣿⡀⠀⢱⠀"
 print_centered "⠀⡜⣀⢀⣶⣀⣰⠆⠀⢀⡏⠀⠀⣿⠀⠀⣸⣄⠤⠄⢸⠃⠀⢰⣶⣶⣶⣿⠀⠀⢸⣉⣉⣉⡇⡀⠀⣶⠀⠀⢹⠀⠀⢀⡀⢀⠀⣇⠀⠀⢶⣶⣶⢾⣿⣿⡀⠀⢱⠀"
 print_centered "⢰⠀⠀⢸⣿⣦⠈⠀⠀⢼⠁⠀⢰⡇⠀⠀⣿⣿⠀⠀⢼⠀⡄⠀⠀⠀⠀⣿⠀⠀⠀⠀⠀⢸⡇⠂⠀⣿⠀⠀⢸⡆⠀⢘⡧⠀⠀⣿⠀⠀⢸⠛⠃⠘⣿⣿⡇⠀⠀⡆"
 print_centered "⢰⠀⠀⢸⣿⣦⠈⠀⠀⢼⠁⠀⢰⡇⠀⠀⣿⣿⠀⠀⢼⠀⡄⠀⠀⠀⠀⣿⠀⠀⠀⠀⠀⢸⡇⠂⠀⣿⠀⠀⢸⡆⠀⢘⡧⠀⠀⣿⠀⠀⢸⠛⠃⠘⣿⣿⡇⠀⠀⡆"
 print_centered "⠀⠑⢤⣀⣙⡿⠉⠱⣄⣠⣷⣄⣀⣹⣄⣀⣘⡏⢆⣀⣘⣧⣀⣀⣀⣀⣀⣿⣀⣀⣀⣀⣀⣸⣇⣀⣰⣏⣀⣠⣿⣀⣀⣾⣁⣀⣴⣋⣀⡠⠃⠀⠀⠀⢿⣋⣀⡤⠋⠀"
 print_centered "⠀⠑⢤⣀⣙⡿⠉⠱⣄⣠⣷⣄⣀⣹⣄⣀⣘⡏⢆⣀⣘⣧⣀⣀⣀⣀⣀⣿⣀⣀⣀⣀⣀⣸⣇⣀⣰⣏⣀⣠⣿⣀⣀⣾⣁⣀⣴⣋⣀⡠⠃⠀⠀⠀⢿⣋⣀⡤⠋⠀"
-print_centered "$(tput setaf 7)"
+print_centered "$(tput sgr0)"
 print_centered "Minecraft Ubuntu Server Builder/install v2.1"
 print_centered "Minecraft Ubuntu Server Builder/install v2.1"
-print_centered "$(tput setaf 7)"
+print_centered "$(tput sgr0)"
 sleep 2
 sleep 2
 
 
 echo -e "$(tput setaf 10)Installation java:$(tput setaf 7)"
 echo -e "$(tput setaf 10)Installation java:$(tput setaf 7)"
@@ -170,13 +170,13 @@ fi
 version=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1)
 version=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1)
 if [ $version -ge 18 ]
 if [ $version -ge 18 ]
 then
 then
-echo -e "$(tput setaf 6)Java version $version =>> OK$(tput setaf 7)"
+echo -e "$(tput setaf 6)Java version $version =>> OK$(tput sgr0)"
 else
 else
 echo "error !"
 echo "error !"
 exit 1
 exit 1
 fi
 fi
 
 
-echo -e "\n$(tput setaf 10)Download/install mcrcon:$(tput setaf 7)"
+echo -e "\n$(tput setaf 10)Download/install mcrcon:$(tput sgr0)"
 cd /home/wareck/
 cd /home/wareck/
 git clone https://github.com/Tiiffi/mcrcon.git
 git clone https://github.com/Tiiffi/mcrcon.git
 cd /home/wareck/mcrcon
 cd /home/wareck/mcrcon
@@ -185,7 +185,7 @@ sudo make install
 cd ..
 cd ..
 rm -r -f /home/wareck/mcrcon
 rm -r -f /home/wareck/mcrcon
 
 
-echo -e "$(tput setaf 10)Download Minecraft server structure:$(tput setaf 7)"
+echo -e "$(tput setaf 10)Download Minecraft server structure:$(tput sgr0)"
 cd /home/wareck/
 cd /home/wareck/
 wget -c http://folivier.homelinux.org/cube/pack/minecraft.tar.xz
 wget -c http://folivier.homelinux.org/cube/pack/minecraft.tar.xz
 tar xfJ minecraft.tar.xz
 tar xfJ minecraft.tar.xz
@@ -196,16 +196,16 @@ cd Minecraft
 rsync --append --progress --recursive * /home/wareck/Minecraft/
 rsync --append --progress --recursive * /home/wareck/Minecraft/
 
 
 
 
-echo -e "\n$(tput setaf 10)Download BuildTools:$(tput setaf 7)"
+echo -e "\n$(tput setaf 10)Download BuildTools:$(tput sgr0)"
 if ! [ -d build ]; then mkdir build ;fi
 if ! [ -d build ]; then mkdir build ;fi
 cd build
 cd build
 wget -c https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
 wget -c https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
 
 
-echo -e "\n$(tput setaf 10)Building Spigot:$(tput setaf 7)"
+echo -e "\n$(tput setaf 10)Building Spigot:$(tput sgr0)"
 java -jar BuildTools.jar
 java -jar BuildTools.jar
 cp spigot* /home/wareck/Minecraft/
 cp spigot* /home/wareck/Minecraft/
 
 
-echo -e "\n$(tput setaf 10)minecraft.service file build/install:$(tput setaf 7)"
+echo -e "\n$(tput setaf 10)minecraft.service file build/install:$(tput sgr0)"
 
 
 if [ -f minecraft.service ];then rm minecraft.service;fi
 if [ -f minecraft.service ];then rm minecraft.service;fi
 
 

+ 2 - 2
options/password.sh

@@ -39,7 +39,7 @@ print_centered "    :        :                        "
 fi
 fi
 if [ $John_ = "Yes" ] && [ $Hashcat_ = "Yes" ]
 if [ $John_ = "Yes" ] && [ $Hashcat_ = "Yes" ]
 then
 then
-echo -n -e "$(tput setaf 7)"
+echo -n -e "$(tput sgr0)"
 print_centered "&"
 print_centered "&"
 fi
 fi
 if [ $Hashcat_ = "Yes" ]
 if [ $Hashcat_ = "Yes" ]
@@ -53,7 +53,7 @@ print_centered "|___|   ||___|   ||__:___/ |___|   ||. _____/|___|   |  |   |"
 print_centered "    |___|    |___|   :         |___| :/          |___|  |___|"
 print_centered "    |___|    |___|   :         |___| :/          |___|  |___|"
 print_centered "                                     :                       "
 print_centered "                                     :                       "
 fi
 fi
-echo -n -e "$(tput setaf 7)"
+echo -n -e "$(tput sgr0)"
 if [ -f /tmp/tmp_txt ];then rm /tmp/tmp_txt ; fi
 if [ -f /tmp/tmp_txt ];then rm /tmp/tmp_txt ; fi
 if [ $John_ = "Yes" ]; then echo -n "John the Ripper " > /tmp/tmp_txt;fi
 if [ $John_ = "Yes" ]; then echo -n "John the Ripper " > /tmp/tmp_txt;fi
 if [ $John_ = "Yes" ] && [ $Hashcat_ = "Yes" ]; then echo -n "& " >>/tmp/tmp_txt;fi
 if [ $John_ = "Yes" ] && [ $Hashcat_ = "Yes" ]; then echo -n "& " >>/tmp/tmp_txt;fi

+ 1 - 1
options/watchdog.sh

@@ -31,7 +31,7 @@ print_centered "| | | |___| |_ ___| |_|    \ ___ ___ "
 print_centered "| | | | .'|  _|  _|   |  |  | . | . |"
 print_centered "| | | | .'|  _|  _|   |  |  | . | . |"
 print_centered "|_____|__,|_| |___|_|_|____/|___|_  |"
 print_centered "|_____|__,|_| |___|_|_|____/|___|_  |"
 print_centered "                                |___|"
 print_centered "                                |___|"
-echo -n "$(tput setaf 7)"
+echo -n "$(tput sgr0)"
 print_centered "Watchdog hardware v1.0"
 print_centered "Watchdog hardware v1.0"
 
 
 if  [ -f /tmp/watchdog.1 ];then rm /tmp/watchdog.1;fi
 if  [ -f /tmp/watchdog.1 ];then rm /tmp/watchdog.1;fi