librewolf-bot/linux
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

several small script fixes

Browse source
This commit is contained in:
ohfp 2020-03-29 00:18:58 +01:00
parent 4618b2865c
commit f257806033
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
content/launch_librewolf.sh → binary_tarball/content/launch_librewolf.sh
View file

0
content/toggle-settings.sh → binary_tarball/content/toggle-settings.sh
View file

2
binary_tarball/scripts/1_Install_Dependencies.sh
View file

@ -3,7 +3,7 @@ printf "\n\n-------------------------------------- DEPENDENCY INSTALLATION -----
# Setup Script Variables # Setup Script Variables
# _DEPENDENCIES="mercurial wget git flatpak flatpak-builder"; # _DEPENDENCIES="mercurial wget git flatpak flatpak-builder";
_DEPENDENCIES="wget git xvfb xz-utils"; _DEPENDENCIES="wget git xvfb xz-utils python3";
# Installs Dependencies # Installs Dependencies
printf "\nInstalling dependencies: $_DEPENDENCIES\n"; printf "\nInstalling dependencies: $_DEPENDENCIES\n";

4
binary_tarball/scripts/4_Build_Binary_Tarball.sh
View file

@ -57,12 +57,12 @@ LLVM_PROFDATA=llvm-profdata \
if [[ ! -s merged.profdata ]]; then if [[ ! -s merged.profdata ]]; then
echo "No profile data produced." echo "No profile data produced."
return 1 exit 1
fi fi
if [[ ! -s jarlog ]]; then if [[ ! -s jarlog ]]; then
echo "No jar log produced." echo "No jar log produced."
return 1 exit 1
fi fi
echo "Removing instrumented browser..." echo "Removing instrumented browser..."

5
binary_tarball/scripts/5_Configure_Binary_Tarball.sh
View file

@ -1,6 +1,9 @@
#!/bin/bash #!/bin/bash
printf "\n\n--------------------------------- SETTINGS INTEGRATION --------------------------------------\n"; printf "\n\n--------------------------------- SETTINGS INTEGRATION --------------------------------------\n";
# Aborts the script upon any faliure
set -e;
# Setup Script Variables # Setup Script Variables
BINARY_TARBALL=$1; BINARY_TARBALL=$1;
TOGGLE_SETTINGS_SCRIPT=$2; TOGGLE_SETTINGS_SCRIPT=$2;
@ -32,7 +35,7 @@ cp $LAUNCHER_SCRIPT $_EXTRACTED_TARBALL_FOLDER/launch_librewolf.sh;
# until we've worked out how to use `--install-settings` with links # until we've worked out how to use `--install-settings` with links
# in all major packages instead # in all major packages instead
printf "\nWorkaround: auto-enable Settings\n" printf "\nWorkaround: auto-enable Settings\n"
cp $_EXTRACTED_TARBALL_FOLDER/settings/* $_EXTRACTED_TARBALL_FOLDER; cp -r $_EXTRACTED_TARBALL_FOLDER/settings/* $_EXTRACTED_TARBALL_FOLDER;
# Add distribution.ini # Add distribution.ini
distini="$_EXTRACTED_TARBALL_FOLDER/distribution/distribution.ini" distini="$_EXTRACTED_TARBALL_FOLDER/distribution/distribution.ini"