From fc427861a044cef114489008451f80faa76225e4 Mon Sep 17 00:00:00 2001 From: xf0r3m Date: Tue, 31 Oct 2023 19:13:14 +0100 Subject: [PATCH] =?utf8?q?Dodanie=20uwarunkowania=20budowy=20LibreWolf=20(?= =?utf8?q?je=C5=9Bli=20pojawi=20si=C4=99=20nowa=20wersja).?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- colors3.sh | 4 +++- librewolf-autobuild.sh | 45 +++++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/colors3.sh b/colors3.sh index a22b1ac..15d25da 100755 --- a/colors3.sh +++ b/colors3.sh @@ -14,11 +14,13 @@ echo -n "de" | figlet > /tmp/de.file; echo -n "x" | figlet > /tmp/x.file; l1=$(awk '{max=length($0)}END{print max}' /tmp/immu.file); +l1=$(expr $l1 - 10); l2=$(awk '{max=length($0)}END{print max}' /tmp/de.file); +l2=$(expr $l2 - 10); while IFS="@" read -r p1 p2 p3 do #printf "${BLUE}%-*s${RED}%-*s${CYAN}%s${ENDCOLOR}\n" "${l1}" "${p1}" "${l2}" "${p2}" "${p3}" - printf "${BLUE}%-${l1}s${RED}%-${l2}s${CYAN}%s${ENDCOLOR}\n" "${p1}" "${p2}" "${p3}" + printf "${BLUE}%-0s${RED}%-${l2}s${CYAN}%s${ENDCOLOR}\n" "${p1}" "${p2}" "${p3}" done < <(paste -d"@" /tmp/immu.file /tmp/de.file /tmp/x.file) diff --git a/librewolf-autobuild.sh b/librewolf-autobuild.sh index 134e030..f126bdc 100644 --- a/librewolf-autobuild.sh +++ b/librewolf-autobuild.sh @@ -27,33 +27,34 @@ idxLWVER=$(grep '^LWVER' /tmp/immudex-base-file.txt | cut -d "'" -f 2) # Determinig is there a new LibreWolf version if [ "$idxLWVER" = "$LWVER" ]; then echo "There is no new version of LibreWolf"; -else echo "There is a new version of LibreWolf"; -fi +else + "There is a new version of LibreWolf"; -# Check if 'librewolf' dir exist, if it's true remove it and create a new one. -if [ -d ~/librewolf ]; then rm -rf ~/librewolf; fi -mkdir ~/librewolf; + # Check if 'librewolf' dir exist, if it's true remove it and create a new one. + if [ -d ~/librewolf ]; then rm -rf ~/librewolf; fi + mkdir ~/librewolf; -# Download lastest LibreWolf tarball. -wget $latestTarballUrl -O ~/librewolf/$(basename $latestTarballUrl); + # Download lastest LibreWolf tarball. + wget $latestTarballUrl -O ~/librewolf/$(basename $latestTarballUrl); -# Extract the tarball and enter to the build directory. -cd ~/librewolf; -tar xf $(basename $latestTarballUrl); -cd $(basename $latestTarballUrl | sed 's/.source.tar.gz//'); + # Extract the tarball and enter to the build directory. + cd ~/librewolf; + tar xf $(basename $latestTarballUrl); + cd $(basename $latestTarballUrl | sed 's/.source.tar.gz//'); -# Starting build x86_64 LibreWolf -build_librewolf; + # Starting build x86_64 LibreWolf + build_librewolf; -# Switching target build architecture -sed -i '22s/.*/ac_add_options --target=i686-linux-gnu/' mozconfig + # Switching target build architecture + sed -i '22s/.*/ac_add_options --target=i686-linux-gnu/' mozconfig -# Start building i686 LibreWolf -build_librewolf; + # Start building i686 LibreWolf + build_librewolf; -# Sending LibreWolf archives to the FTP server. -scp obj-x86_64-pc-linux-gnu/dist/librewolf-${LWVER}.en-US.linux-x86_64.tar.bz2 xf0r3m@ftp.morketsmerke.org:/home/xf0r3m/ftp/immudex/testing/software/librewolf/testing -scp obj-i686-pc-linux-gnu/dist/librewolf-${LWVER}.en-US.linux-i686.tar.bz2 xf0r3m@ftp.morketsmerke.org:/home/xf0r3m/ftp/immudex/testing/software/librewolf/testing; + # Sending LibreWolf archives to the FTP server. + scp obj-x86_64-pc-linux-gnu/dist/librewolf-${LWVER}.en-US.linux-x86_64.tar.bz2 xf0r3m@ftp.morketsmerke.org:/home/xf0r3m/ftp/immudex/testing/software/librewolf/testing + scp obj-i686-pc-linux-gnu/dist/librewolf-${LWVER}.en-US.linux-i686.tar.bz2 xf0r3m@ftp.morketsmerke.org:/home/xf0r3m/ftp/immudex/testing/software/librewolf/testing; -# Notify me, when new LibreWolf version is ready for tests -echo -e "Nowa wersja LibreWolf jest gotowa do testów:\n\nWersja: ${LWVER}\nhttps://ftp.morketsmerke.org/immudex/testing/software/librewolf/testing/librewolf-${LWVER}.en-US.linux-x86_64.tar.bz2\nhttps://ftp.morketsmerke.org/immudex/testing/software/librewolf/testing/librewolf-${LWVER}.en-US.linux-i686.tar.bz2" | mutt -s "Nowa wersja LibreWolf ${LWVER}" jakubstasinski@protonmail.com + # Notify me, when new LibreWolf version is ready for tests + echo -e "Nowa wersja LibreWolf jest gotowa do testów:\n\nWersja: ${LWVER}\nhttps://ftp.morketsmerke.org/immudex/testing/software/librewolf/testing/librewolf-${LWVER}.en-US.linux-x86_64.tar.bz2\nhttps://ftp.morketsmerke.org/immudex/testing/software/librewolf/testing/librewolf-${LWVER}.en-US.linux-i686.tar.bz2" | mutt -s "Nowa wersja LibreWolf ${LWVER}" jakubstasinski@protonmail.com +fi -- 2.39.5