From 10612c8cc3b2212e26b65eb74079b87c5de5630a Mon Sep 17 00:00:00 2001
From: Dominika Liberda <ja@sdomi.pl>
Date: Mon, 11 Oct 2021 15:17:54 +0200
Subject: [PATCH] cbindgen if

---
 scripts/4_Build_Binary_Tarball.sh     | 6 ++++--
 scripts/5_Configure_Binary_Tarball.sh | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/4_Build_Binary_Tarball.sh b/scripts/4_Build_Binary_Tarball.sh
index cf98d3a..d53d76f 100755
--- a/scripts/4_Build_Binary_Tarball.sh
+++ b/scripts/4_Build_Binary_Tarball.sh
@@ -63,8 +63,10 @@ cd $srcdir;
 
 rm -f mozconfig
 
-# install cbindgen
-cargo install --version 0.20.0 cbindgen
+# install cbindgen, but the install crashes on musl
+if [[ "$(/lib/libc.so)" != *"musl libc"* ]]; then
+	cargo install --version 0.20.0 cbindgen
+fi
 
 if [[ $CARCH == 'aarch64' ]]; then
 
diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh
index 526f4bb..7a0cedf 100755
--- a/scripts/5_Configure_Binary_Tarball.sh
+++ b/scripts/5_Configure_Binary_Tarball.sh
@@ -24,7 +24,7 @@ printf "\nCopying librewolf settings to extracted binary tarball\n";
 
 git clone $_SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings;
 cd $_EXTRACTED_TARBALL_FOLDER/settings
-git checkout $_SETTINGS_TAG
+#git checkout $_SETTINGS_TAG
 cd -
 # no need to keep that in there:
 rm -rf "${_EXTRACTED_TARBALL_FOLDER}/settings/.git";