From b33bba7bdac8604349602bd9e3472bb0f004971c Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Sun, 14 Mar 2021 18:38:33 +0100 Subject: remember: you need to use a variable if you want to use a variable.. --- scripts/prep-librewolf-dpkg.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh index cc809af..ca96def 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -32,7 +32,7 @@ librewolf_common_url=https://gitlab.com/librewolf-community/browser/common.git librewolf_settings_url=https://gitlab.com/librewolf-community/settings.git librewolf_linux_url=https://gitlab.com/librewolf-community/browser/linux.git -if [[ DISTRO == 'ubuntu' ]]; then +if [[ ${DISTRO} == 'ubuntu' ]]; then _mozconfig='/config/mozconfig.in' else _mozconfig='/browser.mozconfig.in' @@ -172,7 +172,7 @@ sed -i 's/rustc (>= 1.47),/rustc (>= 1.41),/g' "${debian_dir}"/control.in # add patches to debian/patches mkdir -p "${debian_dir}"/patches/librewolf -if [[ DISTRO == 'ubuntu' ]]; then +if [[ ${DISTRO} == 'ubuntu' ]]; then cp -pr "${git_source_dir}"/linux/megabar.patch "${git_source_dir}"/linux/remove_addons.patch \ "${debian_dir}"/patches/librewolf/ cat <> "${debian_dir}"/patches/series @@ -229,7 +229,7 @@ sed -z "$_cert_sed" -i "${source_dir}"/toolkit/mozapps/extensions/internal/XPIIn ##################################### # Script 4 tasks -if [[ DISTRO == 'debian' ]]; then +if [[ ${DISTRO} == 'debian' ]]; then sed -i -r -e '2{ iexport DEB_BUILD_HARDENING=1 @@ -258,13 +258,13 @@ fi # fix the binary name that gets installed in /usr/bin, and disable crash reporter by changing what variable name it looks for that will enable it -if [[ DISTRO == 'debian' ]]; then +if [[ ${DISTRO} == 'debian' ]]; then sed -i -e '/%if browser/,+2s/firefox/librewolf/' \ -e '/%if CRASH_REPORTER/s/CRASH_REPORTER/CRASH_REPORTER_ENABLED/' \ "${debian_dir}"/browser.install.in -elif [[ DISTRO == 'ubuntu' ]]; then +elif [[ ${DISTRO} == 'ubuntu' ]]; then # let's hope this is enough export MOZ_ENABLE_BREAKPAD=0 export MOZ_APP_NAME=librewolf @@ -275,7 +275,7 @@ rm -rf "${debian_dir}"/librewolf_settings cp -pr "${git_source_dir}"/settings "${debian_dir}"/librewolf_settings rm -rf "${debian_dir}"/librewolf_settings/.git* -if [[ DISTRO == 'debian' ]]; then +if [[ ${DISTRO} == 'debian' ]]; then cat <> "${debian_dir}"/browser.install.in debian/librewolf_settings/librewolf.cfg usr/lib/@browser@ -- cgit