update

upload_mega.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 set -e
-version=5.0
+version=5.1
 date=03/08/2021
-pixz_i=""
-pigz_i=""
+pi7z_i=""
 swap_was="0"
 ftp_i=0
 pv_i=0
@@ -62,21 +61,19 @@ fi
 
 function check_software_ {
 echo -e "\n\e[95mChecking Softwares :\e[0m"
-echo -e -n "Check PIXZ  installed  : "
-if ! [ -x "$(command -v pixz)" ]; then pixz_i="pixz" && echo -e "[\e[91m NO  \e[0m]"; else pixz_i="" && echo -e "[\e[92m YES \e[0m]"; fi
-echo -e -n "Check PIGZ  installed  : "
-if ! [ -x "$(command -v pigz)" ]; then pigz_i="pigz" && echo -e "[\e[91m NO  \e[0m]"; else pigz_i="" && echo -e "[\e[92m YES \e[0m]"; fi
+echo -e -n "Check PI7Z  installed  : "
+if ! [ -x "$(command -v 7z)" ]; then pi7z_i="p7zip-full" && echo -e "[\e[91m NO  \e[0m]"; else pi7z_i="" && echo -e "[\e[92m YES \e[0m]"; fi
 echo -e -n "Check LFTP  installed  : "
 if ! [ -x "$(command -v lftp)" ]; then ftp_i="lftp" && echo -e "[\e[91m NO  \e[0m]"; else ftp_i="" && echo -e "[\e[92m YES \e[0m]"; fi
 echo -e -n "Check CIFS  installed  : "
 if ! [ -x "$(command -v cifscreds)" ]; then cifs_i="cifs-utils" && echo -e "[\e[91m NO  \e[0m]"; else cifs_i="" && echo -e "[\e[92m YES \e[0m]"; fi
 echo -e -n "Check PV    installed  : "
 if ! [ -x "$(command -v pv)" ]; then pv_i="pv" && echo -e "[\e[91m NO  \e[0m]"; else pv_i="" && echo -e "[\e[92m YES \e[0m]"; fi
-if [[ ! $ftp_i = "" || ! $pixz_i = "" || ! $pv_i = "" || ! $pigz_i = "" || ! $cifs_i = "" ]]
+if [[ ! $ftp_i = "" || ! $pi7z_i = "" || ! $pv_i = "" || ! $cifs_i = "" ]]
 then
 echo -e "\n\e[95mSoftwares update & install :\e[0m"
 sudo apt-get update
-sudo apt install $pixz_i $ftp_i $pv_i $lrzip_i $pigz_i $cifs_i -y
+sudo apt install $pi7z_i $ftp_i $pv_i $cifs_i -y
 check_software_
 fi
 echo -e "Done."
@@ -139,31 +136,26 @@ fi
 function packit {
 echo -e "\n\e[95mPacking & Compressing Files :\e[0m"
 cd /home/$USER
-SIZE1=`du -sk /home/$USER/.okcash/blk0001.dat | cut -f 1`
-SIZE2=`du -sk /home/$USER/.okcash/txleveldb/ | cut -f 1`
-echo -e "\e[97mTar txleveldb :\e[0m"
-tar cf - .okcash/txleveldb/* | pv -s ${SIZE1}k > bootstrap1.tar
-echo -e "\e[97mTar blk0001.dat :\e[0m"
-tar cf - .okcash/blk0001.dat | pv -s ${SIZE2}k > bootstrap2.tar
-echo -e "\e[97mTar & PiXz bootstrap.tar.xz:\e[0m"
-SIZE1=`du -sk /home/$USER/bootstrap1.tar | cut -f 1`
-SIZE2=`du -sk /home/$USER/bootstrap2.tar | cut -f 1`
-SIZE=$(($SIZE2+$SIZE1))
-tar cf - bootstrap1.tar bootstrap2.tar  | pv -s ${SIZE}k | pixz > bootstrap.tar.xz
-rm bootstrap1.tar bootstrap2.tar
+#SIZE1=`du -sk /home/$USER/.okcash/blk0001.dat | cut -f 1`
+#SIZE2=`du -sk /home/$USER/.okcash/txleveldb/ | cut -f 1`
+#SIZET=$(($SIZE2+$SIZE1))
+#echo -e "\e[97mTar & PiXz bootstrap.tar.xz:\e[0m"
+echo -e "\e[97mCompress & split bootstrap.7z:\e[0m"
+split_size="${split_size}m"
+7z a -v$split_size bootstrap .okcash/blk0001.dat .okcash/txleveldb/
 sleep 1
 echo "Done."
 
-echo -e "\n\e[95mSplitting Files (${split_size}M):\e[0m"
-split --verbose --numeric-suffixes=1 -b ${split_size}M bootstrap.tar.xz "bootstrap.part"
-rm bootstrap.tar.xz
-sleep 1
-echo "Done."
+#echo -e "\n\e[95mSplitting Files (${split_size}M):\e[0m"
+#split --verbose --numeric-suffixes=1 -b ${split_size}M bootstrap.tar.xz "bootstrap.part"
+#rm bootstrap.tar.xz
+#sleep 1
+#echo "Done."
 
 echo -e "\n\e[95mMake bootstrap_v.txt:\e[0m"
 if [ -f bootstrap_v.txt ]; then rm bootstrap_v.txt;fi
 Raw_date="`date +%d.%m.%Y`"
-YYYY=`ls -l bootstrap*.part* | wc -l`
+YYYY=`ls -l bootstrap*.0* | wc -l`
 cat <<'EOF'>> bootstrap_v.txt
 Bootstrap : XXXX
 Parts: YYYY
@@ -173,10 +165,10 @@ sed -i -e "s/YYYY/$YYYY/g" bootstrap_v.txt
 echo "Done."
 
 echo -e "\n\e[95mMd5sum Files:\e[0m"
-zap=$(ls -l bootstrap.part* | wc -l)
-for i in `seq -w 01 $zap`
+zap=$(ls -l bootstrap.7z.* | wc -l)
+for i in `seq -w 001 $zap`
 do
-echo -e -n "md5sum Bootstrap.part$i: " && md5sum bootstrap.part$i > bootstrap$i.md5 && echo -e "\e[1mDone.\e[0m"
+echo -e -n "md5sum Bootstrap.7z.$i: " && md5sum bootstrap.7z.$i > bootstrap.$i.md5 && echo -e "\e[1mDone.\e[0m"
 done
 touch /home/$USER/bootstrap_uploadpass
 }
@@ -204,12 +196,12 @@ echo -n $ftp_file && echo -e ": \e[1mDone.\e[0m";
 
 function upload {
 cd /home/$USER
-echo -e "\n\e[95mUpload files to server :\e[0m"
+echo -e "\n\e[95mUpload files to FTP server :\e[0m"
 ftp_file=bootstrap_v.txt && ftp_loop
-zap=$(ls -l bootstrap.part* | wc -l)
-for j in `seq -w 01 $zap`
+zap=$(ls -l bootstrap.7z.0* | wc -l)
+for j in `seq -w 001 $zap`
 do
-ftp_file=bootstrap$j.md5
+ftp_file=bootstrap.$j.md5
 ftp_loop
 done
 
@@ -221,12 +213,19 @@ sudo umount /tmp/bootstrap/
 fi
 sudo mount -t cifs //mafreebox.freebox.fr/Disque\ dur/  /tmp/bootstrap/ -o user=freebox,password=password,uid=1000,gid=1000,rw,vers=1.0
 if ! [ -d /tmp/bootstrap/bootstrap ]; then mkdir /tmp/bootstrap/bootstrap ;fi
-cp -v bootstrap.part* /tmp/bootstrap/bootstrap/
+cp -v bootstrap.7z.* /tmp/bootstrap/bootstrap/
 cp -v bootstrap_v.txt /tmp/bootstrap/bootstrap/
-cp -v bootstrap*.md5 /tmp/bootstrap/bootstrap/
+cp -v bootstrap.*.md5 /tmp/bootstrap/bootstrap/
+if [ -f bootstrap_okcash ]
+then
+rm bootstrap_okcash
+fi
+git clone https://github.com/wareck/bootstrap_okcash.git
+cp -v bootstrap_v.txt bootstrap_okcash/
+cp -v bootstrap.*.md5 bootstrap_okcash/
+
 sleep 5
 sudo umount /tmp/bootstrap
-
 freeze_off
 echo -e "\n\e[92mUpload Done ...\n\e[0m"
 }
@@ -248,11 +247,12 @@ echo -e "Old files are still present."
 echo -e "If you want to force restart build/upload"
 echo -e "remove files by using this command:"
 echo -e ""
-echo -e "rm -r -f /home/$USER/bootstrap.tar.xz /home/$USER/bootstrap_v.txt /home/$USER/bootstrap*.md5 /home/$USER/bootstrap_uploadpass"
+echo -e "rm -r -f /home/$USER/bootstrap.7z.* /home/$USER/bootstrap_v.txt /home/$USER/bootstrap.7z.*.md5 /home/$USER/bootstrap_uploadpass"
 sleep 5
 fi
 }
 
+
 if  ps -ef | grep -v grep | grep okcashd >/dev/null
 then
 echo -e "\n\e[38;5;166mOKcash daemon is working => shutdown and restart during this process !...\e[0m"