Browse Source

update/fix

Votre Nom 2 years ago
parent
commit
5fe4d1184b
2 changed files with 25 additions and 22 deletions
  1. 20 18
      build_cube.sh
  2. 5 4
      options/chia.sh

+ 20 - 18
build_cube.sh

@@ -435,16 +435,6 @@ sudo rm zap
 sudo rm zap2
 sleep 1
 
-#remove screensaver
-cat <<EOF>> autostart
-@lxpanel --profile LXDE
-@pcmanfm --desktop --profile LXDE
-EOF
-sudo chmod 744 autostart
-sudo cp autostart /etc/xdg/lxsession/LXDE/
-sudo cp autostart /home/wareck/.config/lxsession/LXDE/
-sudo rm autostart
-
 sudo rm -r -f /etc/update-motd.d/*
 tar xfJ pack1.tar.xz --checkpoint=.10
 echo -n -e "\n"
@@ -470,9 +460,10 @@ if ! [ -r /media/Store ];then sudo mkdir /media/Store && cd / & sudo ln -s /medi
 if ! [ -r /media/Partage ];then sudo mkdir /media/Partage && cd / & sudo ln -s /media/Partage /Partage;fi
 if ! [ -r /media/Nas ];then sudo mkdir /media/Nas && cd / & sudo ln -s /media/Nas /Nas;fi
 if ! [ -r /media/Nvme ];then sudo mkdir /media/Nvme && cd / & sudo ln -s /media/Nvme /Nvme ;fi
-if ! [ -r /Chia1 ];then sudo mkdir /Chia1;fi
-if ! [ -r /Chia1 ];then sudo mkdir /Chia2;fi
-if ! [ -r /Chia3 ];then sudo mkdir /Chia3;fi
+if ! [ -r /Chia ];then sudo mkdir /Chia;fi
+if ! [ -r /Chia/Chia1 ];then sudo mkdir /Chia/Chia1;fi
+if ! [ -r /Chia/Chia2 ];then sudo mkdir /Chia/Chia2;fi
+if ! [ -r /Chia/Chia3 ];then sudo mkdir /Chia/Chia3;fi
 if ! grep "UUID=UUID=1df72b63-fca0-45c6-992c-3e2532d5591a /media/Store ext4" /etc/fstab >/dev/null
 then
 cp /etc/fstab /tmp/fstab
@@ -485,8 +476,8 @@ UUID=9a837a47-aa05-4ca5-a2e1-2838e53bb9b7 /media/Partage ext4
 UUID=d1bef3f1-a806-4498-9294-c266e84fd1ef /media/Nvme btrfs ssd,nodatacow,noatime
 #external drive
 #UUID=5C8687930F62EE79 /media/Chia ntfs auto,nofail,noatime,rw,user    0   0
-UUID=66be44f6-f8e9-473c-9b71-db849f870099 /Chia1 ext4 auto,nofail,noatime,rw,user    0   0
-UUID=ff359fe7-279d-46aa-a546-4f041b5309fe /Chia2 ext4 auto,nofail,noatime,rw,user    0   0
+UUID=66be44f6-f8e9-473c-9b71-db849f870099 /Chia/Chia1 ext4 auto,nofail,noatime,rw,user    0   0
+UUID=ff359fe7-279d-46aa-a546-4f041b5309fe /Chia/Chia2 ext4 auto,nofail,noatime,rw,user    0   0
 EOF
 sudo cp /tmp/fstab /etc/fstab
 fi
@@ -778,15 +769,24 @@ Exec=gnome-terminal --preferences
 EOF
 chmod +x /home/wareck/.config/autostart/zappy.desktop
 fi
-
-
-
 if ! grep "wareck" /etc/sudoers >/dev/null
 then
 sudo sh -c "echo \"wareck ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers"
 fi
 }
 
+function remove_screensaver {
+#remove screensaver
+cat <<EOF>> autostart
+@lxpanel --profile LXDE
+@pcmanfm --desktop --profile LXDE
+EOF
+sudo chmod 744 autostart
+sudo cp autostart /etc/xdg/lxsession/LXDE/
+sudo cp autostart /home/wareck/.config/lxsession/LXDE/
+sudo rm autostart
+}
+
 intro_
 ubuntu_version_check
 update_
@@ -802,6 +802,8 @@ mounting_drives_
 cleaning_
 clear
 dynmotd
+remove_screensaver
+
 
 echo -e "$(tput setaf 10)\nEnd of script:$(tput sgr0) \n"
 echo -e "$(tput setaf 7)Need to install webmin manually (reboot required)$(tput sgr0)"

+ 5 - 4
options/chia.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -e
+Gui=Yes
 Version=2.3
-Gui=no #YES for gui build
+
 function print_centered {
      [[ $# == 0 ]] && return 1
 
@@ -33,12 +34,12 @@ print_centered "|   ---|     ||  ||  _  |"
 print_centered "|______|__|__||__||___._|"
 echo -n "$(tput setaf 7)"
 print_centered "Toolkit for Chia v$Version"
-if [ $Gui = "YES" ]
+if [ $Gui = "Yes" ]
 then
+echo -n "$(tput setaf 3)"
+print_centered "Chia Gui Enabled"
 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)"
 sudo apt-get install python3-venv python3-distutils python3-dev libsodium-dev -y