diff --git a/scripts/1_Install_Dependencies.sh b/scripts/1_Install_Dependencies.sh index 389ef1b..a9d7924 100755 --- a/scripts/1_Install_Dependencies.sh +++ b/scripts/1_Install_Dependencies.sh @@ -38,6 +38,8 @@ _DEPENDENCIES="wget git xvfb \ python \ libffi-dev \ nodejs-mozilla \ + cargo \ + rustc \ nasm-mozilla" # cargo \ @@ -66,6 +68,6 @@ else fi # we need a more recent rust -curl https://sh.rustup.rs -o rustup.sh -bash rustup.sh -y -source /root/.cargo/env +# curl https://sh.rustup.rs -o rustup.sh +# bash rustup.sh -y +# source /root/.cargo/env diff --git a/scripts/4_Build_Binary_Tarball.sh b/scripts/4_Build_Binary_Tarball.sh index 4aff574..dffbcaf 100755 --- a/scripts/4_Build_Binary_Tarball.sh +++ b/scripts/4_Build_Binary_Tarball.sh @@ -17,7 +17,7 @@ export DEB_BUILD_HARDENING_PIE=1 # export PATH=/usr/lib/nasm-mozilla/bin:$PATH # add cargo binary to path -source /root/.cargo/env +# source /root/.cargo/env # we do change / unset some of them later, but setting them as set by Arch # might make it easier to maintain changes in build scripts on both sides diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh index 35b105a..de12ee3 100755 --- a/scripts/5_Configure_Binary_Tarball.sh +++ b/scripts/5_Configure_Binary_Tarball.sh @@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} _SCRIPT_FOLDER=$(realpath $(dirname $0)); _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf; -_SETTINGS_TAG=${SETTINGS_TAG:-'1.5'} +_SETTINGS_TAG=${SETTINGS_TAG:-'1.6'} _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball