domi/foxgirl-linux
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix build

Browse source
This commit is contained in:
BeatLink 2019-08-17 18:33:13 -05:00
parent 41206e66e0
commit 800285cc3c
4 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appimage/build_appimage.sh
View file

@ -29,7 +29,7 @@ printf "\nDownloading AppImage Tool\n";
apt -qq update && apt -qqy install wget;
wget $_APPIMAGETOOL_DOWNLOAD_URL -O $_APPIMAGETOOL_FILE;
chmod +x $_APPIMAGETOOL_FILE;
$_APPIMAGETOOL_FILE --appimage-mount $_APPIMAGETOOL_EXTRACTED_FOLDER;
$_APPIMAGETOOL_FILE --appimage-extract $_APPIMAGETOOL_EXTRACTED_FOLDER;
rm -f $_APPIMAGETOOL_FILE;
# Generate AppImage

4
binary_tarball/scripts/1_Install_Dependencies.sh
View file

@ -6,5 +6,5 @@ _DEPENDENCIES="mercurial wget git";
# Installs Dependencies
printf "\nInstalling dependencies: $_DEPENDENCIES\n";
apt-get -qq update;
apt-get -y -qq install $_DEPENDENCIES;
DEBIAN_FRONTEND=noninteractive apt-get -qq update;
DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $_DEPENDENCIES;

6
binary_tarball/scripts/5_Configure_Binary_Tarball.sh
View file

@ -10,17 +10,17 @@ _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
# Extracts the binary tarball
printf "\nExtracting librewolf binary tarball\n";
tar -xvf $BINARY_TARBALL;
tar -xf $BINARY_TARBALL;
# Adds the librefox config files to the packaged tarball
printf "\nCopying librewolf settings to extracted binary tarball\n";
git clone _SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings;
git clone $_SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings;
cp $TOGGLE_SETTINGS_SCRIPT $_EXTRACTED_TARBALL_FOLDER/settings;
cp $LAUNCHER_SCRIPT $_EXTRACTED_TARBALL_FOLDER/launch_librewolf.sh;
# Repacks the binary tarball
printf "\nRecompressing binary tarball\n";
tar -jcvf $BINARY_TARBALL $_EXTRACTED_TARBALL_FOLDER;
tar -jcf $BINARY_TARBALL $_EXTRACTED_TARBALL_FOLDER;

12
flatpak/build_flatpak.sh
View file

@ -9,10 +9,6 @@ BINARY_TARBALL=$1;
FLATPAK_REPO=$2;
FLATPAK_BUNDLE=$3;
_SCRIPT_FOLDER=$(realpath $(dirname $0));
_APT_SOURCE_LIST=/etc/apt/source.list;
_APT_REPO='deb http://ppa.launchpad.net/alexlarsson/flatpak/ubuntu bionic main'
_APT_REPO_KEY=FA577F07;
_APT_PACKAGES_TO_INSTALL="flatpak flatpak-builder";
_FLATHUB_REPO="flathub https://flathub.org/repo/flathub.flatpakrepo";
_FLATHUB_PACKAGES_TO_INSTALL="org.gnome.Platform/x86_64/3.32 org.gnome.Sdk/x86_64/3.32";
_EXTRACTED_BINARY_TARBALL_FOLDER=./librewolf
@ -20,14 +16,6 @@ _FLATPAK_JSON_FILE=$_SCRIPT_FOLDER/content/io.gitlab.LibreWolf.json;
_FLATPAK_BUILD_SOURCE_FOLDER=./source;
_FLATPAK_BUILD_FOLDER=build-dir;
# Install flatpak
printf "\nInstalling flatpak\n";
echo $_APT_REPO >> $_APT_SOURCE_LIST;
apt-get -qq update && apt-get -qqy install gnupg2 && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys $_APT_REPO_KEY;
apt-get -qq update;
apt-get -qqy install $_APT_PACKAGES_TO_INSTALL;
# Install build dependencies
printf "\nInstalling flatpak build dependencies\n";
flatpak remote-add --if-not-exists $_FLATHUB_REPO;