diff options
| author | B Stack <bgstack15@gmail.com> | 2021-02-01 09:35:54 -0500 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2021-02-01 09:35:54 -0500 |
| commit | 9a0c533c0a343c4c35cab431f67b98f3a6e94e12 (patch) | |
| tree | 6b6b51c2e0e387c518aa08ac988b9cbc46688135 /arch/01_build.sh | |
| parent | add notes from !12 (diff) | |
| parent | fix a badly merged patch (diff) | |
| download | librewolf-linux-9a0c533c0a343c4c35cab431f67b98f3a6e94e12.tar.gz librewolf-linux-9a0c533c0a343c4c35cab431f67b98f3a6e94e12.tar.bz2 librewolf-linux-9a0c533c0a343c4c35cab431f67b98f3a6e94e12.zip | |
Merge branch 'master' of https://gitlab.com/librewolf-community/browser/linux into debian
Diffstat (limited to 'arch/01_build.sh')
| -rwxr-xr-x | arch/01_build.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/01_build.sh b/arch/01_build.sh index 1faceaa..3ddab39 100755 --- a/arch/01_build.sh +++ b/arch/01_build.sh @@ -1,5 +1,6 @@ #!/bin/bash +PKGBUILD_NAME=${PKGBUILD_NAME:-'PKGBUILD'} pacman --noconfirm -Syu --needed base-devel # this is a very ugly fix for recent makepkg-5.1-chmod-shenanigans, which mess up the build process in docker sed -E -i 's/^chmod a-s \"\$BUILDDIR\"$/# chmod a-s \"\$BUILDDIR\"/' `which makepkg` @@ -9,7 +10,8 @@ usermod -d /home/nobody nobody # we need to un-expire the account, otherwise PAM will complain usermod -e '' nobody chown -R nobody . -# temporary workaround for rust / packed_simd build issue: -pacman --noconfirm -U https://archive.archlinux.org/packages/r/rust/rust-1%3A1.47.0-4-x86_64.pkg.tar.zst +if [[ ! -z "${GLOBAL_MENUBAR}" ]];then + PKGBUILD_NAME='PKGBUILD_global_menubar' +fi # makepkg will not run as root -sudo -u nobody -E -H makepkg --noconfirm --nosign --syncdeps --cleanbuild +sudo -u nobody -E -H makepkg --noconfirm --nosign --syncdeps --cleanbuild -p "${PKGBUILD_NAME}" |