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

fix tarball, flatpak and appimage build scripts

Browse source 
Build image changed from ubuntu 18.04 to 18.10 since flatpak-builder
in 18.04 doesn't have source type 'dir' implemented yet
This commit is contained in:
Ilya Lesikov 2019-11-05 15:08:43 +03:00
parent 737d1510e5
commit 241b2fe2dd
6 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -1,4 +1,4 @@
image: ubuntu:18.04 image: ubuntu:18.10
variables: variables:
BINARY_TARBALL: "$CI_PROJECT_DIR/LibreWolf.tar.bz2" BINARY_TARBALL: "$CI_PROJECT_DIR/LibreWolf.tar.bz2"

5
appimage/build_appimage.sh
View file

@ -14,7 +14,7 @@ BINARY_TARBALL=$1
APPIMAGE_FILE=$2 APPIMAGE_FILE=$2
_SCRIPT_FOLDER=$(realpath $(dirname $0)); _SCRIPT_FOLDER=$(realpath $(dirname $0));
_BINARY_TARBALL_EXTRACTED_FOLDER=$_SCRIPT_FOLDER/librewolf; _BINARY_TARBALL_EXTRACTED_FOLDER=$_SCRIPT_FOLDER/librewolf;
_BUILD_APPIMAGE_FILE=$_SCRIPT_FOLDER/LibreWolf*.AppImage; _BUILD_APPIMAGE_FILE=$_SCRIPT_FOLDER/LibreWolf.AppImage;
_APPIMAGETOOL_DOWNLOAD_URL=https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage; _APPIMAGETOOL_DOWNLOAD_URL=https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage;
_APPIMAGETOOL_EXTRACTED_FOLDER=$_SCRIPT_FOLDER/squashfs-root; _APPIMAGETOOL_EXTRACTED_FOLDER=$_SCRIPT_FOLDER/squashfs-root;
_APPIMAGETOOL_FILE=$_SCRIPT_FOLDER/appimagetool; _APPIMAGETOOL_FILE=$_SCRIPT_FOLDER/appimagetool;
@ -40,7 +40,8 @@ chmod +x $_APPIMAGETOOL_FILE;
# Generate AppImage # Generate AppImage
printf "\nGenerating AppImage\n"; printf "\nGenerating AppImage\n";
ARCH=x86_64 $_APPIMAGETOOL_FILE --appimage-extract-and-run $_BINARY_TARBALL_EXTRACTED_FOLDER; ARCH=x86_64 $_APPIMAGETOOL_FILE --appimage-extract-and-run\
$_BINARY_TARBALL_EXTRACTED_FOLDER $_BUILD_APPIMAGE_FILE;
chmod +x $_BUILD_APPIMAGE_FILE; chmod +x $_BUILD_APPIMAGE_FILE;
# Move AppImage to specified location # Move AppImage to specified location

2
binary_tarball/scripts/1_Install_Dependencies.sh
View file

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

4
binary_tarball/scripts/5_Configure_Binary_Tarball.sh
View file

@ -11,7 +11,7 @@ _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
# Extracts the binary tarball # Extracts the binary tarball
printf "\nExtracting librewolf binary tarball\n"; printf "\nExtracting librewolf binary tarball\n";
tar -xf $BINARY_TARBALL; tar -xf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER/..;
# Adds the librefox config files to the packaged tarball # Adds the librefox config files to the packaged tarball
printf "\nCopying librewolf settings to extracted binary tarball\n"; printf "\nCopying librewolf settings to extracted binary tarball\n";
@ -22,6 +22,6 @@ cp $LAUNCHER_SCRIPT $_EXTRACTED_TARBALL_FOLDER/launch_librewolf.sh;
# Repacks the binary tarball # Repacks the binary tarball
printf "\nRecompressing binary tarball\n"; printf "\nRecompressing binary tarball\n";
tar -jvcf $BINARY_TARBALL $_EXTRACTED_TARBALL_FOLDER; tar -jvcf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER .;

4
flatpak/build_flatpak.sh
View file

@ -23,11 +23,13 @@ flatpak install -y flathub $_FLATHUB_PACKAGES_TO_INSTALL;
# Extracts the binary tarball # Extracts the binary tarball
printf "\nExtracting librewolf binary tarball\n"; printf "\nExtracting librewolf binary tarball\n";
mkdir -p $_EXTRACTED_BINARY_TARBALL_FOLDER;
tar -xvf $BINARY_TARBALL -C $_EXTRACTED_BINARY_TARBALL_FOLDER; tar -xvf $BINARY_TARBALL -C $_EXTRACTED_BINARY_TARBALL_FOLDER;
# Prepare for flatpak build # Prepare for flatpak build
printf "\nPreparing files for flatpak build\n"; printf "\nPreparing files for flatpak build\n";
mkdir $_FLATPAK_BUILD_SOURCE_FOLDER && mv $_EXTRACTED_BINARY_TARBALL_FOLDER $_FLATPAK_BUILD_SOURCE_FOLDER/librewolf; mkdir -p $_FLATPAK_BUILD_SOURCE_FOLDER;
mv $_EXTRACTED_BINARY_TARBALL_FOLDER $_FLATPAK_BUILD_SOURCE_FOLDER;
# Build Repo # Build Repo
printf "\nBuilding flatpak repository\n"; printf "\nBuilding flatpak repository\n";

2
flatpak/content/io.gitlab.LibreWolf.json
View file

@ -13,7 +13,7 @@
], ],
"sources": [{ "sources": [{
"type": "dir", "type": "dir",
"path": "source" "path": "flatpak/source"
}] }]
}], }],
"finish-args": [ "finish-args": [