diff --git a/artifacts_deb.sh b/artifacts_deb.sh index 8da7ae0..d2c3305 100644 --- a/artifacts_deb.sh +++ b/artifacts_deb.sh @@ -2,7 +2,7 @@ # sanity checks if [ ! -d obj-x86_64-pc-linux-gnu/dist/firefox ]; then - echo "installer_win.sh: directory obj-x86_64-pc-linux-gnu/dist/firefox not found." + echo "installer_deb.sh: directory obj-x86_64-pc-linux-gnu/dist/firefox not found." exit 1; fi @@ -27,11 +27,11 @@ cd librewolf ; rm -rf maintenanceservice* pingsender* firefox.*.xml precomplete cp -v branding_files/register-librewolf branding_files/start-librewolf* librewolf # be sure to remove the previous zip file.. -rm -f librewolf-$pkgver.en-US.debian.zip* +rm -f librewolf-$pkgver.en-US.deb.zip* -zip -r9 librewolf-$pkgver.en-US.debian.zip librewolf +zip -r9 librewolf-$pkgver.en-US.deb.zip librewolf if [ $? -ne 0 ]; then exit 1; fi -sha256sum librewolf-$pkgver.en-US.debian.zip > librewolf-$pkgver.en-US.debian.zip.sha256sum +sha256sum librewolf-$pkgver.en-US.deb.zip > librewolf-$pkgver.en-US.deb.zip.sha256sum if [ $? -ne 0 ]; then exit 1; fi diff --git a/artifacts_rpm.sh b/artifacts_rpm.sh new file mode 100644 index 0000000..bfa72b0 --- /dev/null +++ b/artifacts_rpm.sh @@ -0,0 +1,38 @@ +#!/usr/bin/bash + +# sanity checks +if [ ! -d obj-x86_64-pc-linux-gnu/dist/firefox ]; then + echo "installer_rpm.sh: directory obj-x86_64-pc-linux-gnu/dist/firefox not found." + exit 1; +fi + +rm -rf ../firefox ../librewolf +cp -r obj-x86_64-pc-linux-gnu/dist/firefox .. + + +pushd .. +mv firefox librewolf + +# apply the LibreWolf settings +cp -rv settings/* librewolf +# rename the executable manually +cd librewolf ; mv -v firefox librewolf ; cd .. + +# recreate the zip file.. + +# clean garbage files +cd librewolf ; rm -rf maintenanceservice* pingsender* firefox.*.xml precomplete removed-files ; cd .. + +# copy the files to register LibreWolf as local app. +cp -v branding_files/register-librewolf branding_files/start-librewolf* librewolf + +# be sure to remove the previous zip file.. +rm -f librewolf-$pkgver.en-US.rpm.zip* + +zip -r9 librewolf-$pkgver.en-US.rpm.zip librewolf +if [ $? -ne 0 ]; then exit 1; fi +sha256sum librewolf-$pkgver.en-US.rpm.zip > librewolf-$pkgver.en-US.rpm.zip.sha256sum +if [ $? -ne 0 ]; then exit 1; fi + + +popd diff --git a/build.sh b/build.sh index c9837e6..3f9f9db 100755 --- a/build.sh +++ b/build.sh @@ -15,6 +15,13 @@ deps_deb() { echo "deps_deb: done." } +deps_rpm() { + echo "deps_rpm: begin." + deps="python3 python3-distutils clang pkg-config libpulse-dev gcc curl wget nodejs libpango1.0-dev nasm yasm zip m4 libgtk-3-dev libgtk2.0-dev libdbus-glib-1-dev libxt-dev" + dnf -y install $deps + echo "deps_rpm: done." +} + rustup() { # rust needs special love: https://www.atechtown.com/install-rust-language-on-debian-10/ echo "rustup: begin." @@ -24,13 +31,6 @@ rustup() { echo "rustup: done." } -deps_rpm() { - echo "deps_rpm: begin." - deps="" - dnf -y install $deps - echo "deps_rpm: done." -} - mach_env() { echo "mach_env: begin." if [ ! -d firefox-$pkgver ]; then exit 1; fi @@ -237,6 +237,21 @@ artifacts_deb() } +artifacts_rpm() +{ + echo "artifacts_rpm: begin." + if [ ! -d firefox-$pkgver ]; then exit 1; fi + cd firefox-$pkgver + + ./mach package + if [ $? -ne 0 ]; then exit 1; fi + + . ../artifacts_rpm.sh + + cd .. + echo "artifacts_rpm: done." +} + # windows: change $PATH to find all the build tools in .mozbuild # this might do the trick on macos aswell? @@ -294,6 +309,15 @@ if [[ "$*" == *artifacts_deb* ]]; then done_something=1 fi +if [[ "$*" == *artifacts_rpm* ]]; then + artifacts_rpm + done_something=1 +fi + + + + + # by default, give help.. if (( done_something == 0 )); then cat <