fix flatpak and appimage build
This commit is contained in:
parent
3dfc48697b
commit
918dbd352f
|
@ -7,17 +7,18 @@ set -e;
|
|||
# Sets up script variables
|
||||
BINARY_TARBALL=$1
|
||||
APPIMAGE_FILE=$2
|
||||
SCRIPT_FOLDER=$(realpath $(dirname $0));
|
||||
_BINARY_TARBALL_EXTRACTED_FOLDER=$SCRIPT_FOLDER/librewolf;
|
||||
_BUILD_APPIMAGE_FILE=$SCRIPT_FOLDER/LibreWolf*.AppImage;
|
||||
_SCRIPT_FOLDER=$(realpath $(dirname $0));
|
||||
_BINARY_TARBALL_EXTRACTED_FOLDER=$_SCRIPT_FOLDER/librewolf;
|
||||
_BUILD_APPIMAGE_FILE=$_SCRIPT_FOLDER/LibreWolf*.AppImage;
|
||||
_APPIMAGETOOL_DOWNLOAD_URL=https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage;
|
||||
_APPIMAGETOOL_EXTRACTED_FOLDER=$SCRIPT_FOLDER/squashfs-root;
|
||||
_APPIMAGETOOL_FILE=$SCRIPT_FOLDER/appimagetool;
|
||||
_APPIMAGE_CONTENT_FOLDER=$SCRIPT_FOLDER/content
|
||||
_APPIMAGETOOL_EXTRACTED_FOLDER=$_SCRIPT_FOLDER/squashfs-root;
|
||||
_APPIMAGETOOL_FILE=$_SCRIPT_FOLDER/appimagetool;
|
||||
_APPIMAGE_CONTENT_FOLDER=$_SCRIPT_FOLDER/content
|
||||
|
||||
# Extracts the binary tarball
|
||||
printf "\nExtracting librewolf binary tarball\n";
|
||||
tar -xvf $BINARY_TARBALL;
|
||||
mkdir $_BINARY_TARBALL_EXTRACTED_FOLDER;
|
||||
tar -xvf $BINARY_TARBALL -C $_BINARY_TARBALL_EXTRACTED_FOLDER;
|
||||
|
||||
# Copy appimage resources to main tarball
|
||||
printf "Copying AppImage resources to binary tarball folder\n";
|
||||
|
@ -25,16 +26,18 @@ cp -vrT $_APPIMAGE_CONTENT_FOLDER $_BINARY_TARBALL_EXTRACTED_FOLDER;
|
|||
|
||||
# Downloads appimage tool
|
||||
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-extract;
|
||||
rm -f $_APPIMAGETOOL_FILE;
|
||||
#$_APPIMAGETOOL_FILE --appimage-mount $_APPIMAGETOOL_EXTRACTED_FOLDER;
|
||||
#rm -f $_APPIMAGETOOL_FILE;
|
||||
|
||||
# Generate AppImage
|
||||
printf "\nGenerating AppImage\n";
|
||||
$_APPIMAGETOOL_EXTRACTED_FOLDER/AppRun $_BINARY_TARBALL_EXTRACTED_FOLDER;
|
||||
#$_APPIMAGETOOL_EXTRACTED_FOLDER/AppRun $_BINARY_TARBALL_EXTRACTED_FOLDER;
|
||||
ARCH=x86_64 $_APPIMAGETOOL_FILE $_BINARY_TARBALL_EXTRACTED_FOLDER;
|
||||
rm -rf $_BINARY_TARBALL_EXTRACTED_FOLDER;
|
||||
rm -rf $_APPIMAGETOOL_EXTRACTED_FOLDER;
|
||||
#rm -rf $_APPIMAGETOOL_EXTRACTED_FOLDER;
|
||||
chmod +x $_BUILD_APPIMAGE_FILE;
|
||||
|
||||
# Move AppImage to specified location
|
||||
|
|
|
@ -8,6 +8,7 @@ set -e;
|
|||
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;
|
||||
|
@ -15,7 +16,7 @@ _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
|
||||
_FLATPAK_JSON_FILE=./content/io.gitlab.LibreWolf.json;
|
||||
_FLATPAK_JSON_FILE=$_SCRIPT_FOLDER/content/io.gitlab.LibreWolf.json;
|
||||
_FLATPAK_BUILD_SOURCE_FOLDER=./source;
|
||||
_FLATPAK_BUILD_FOLDER=build-dir;
|
||||
|
||||
|
|
Loading…
Reference in a new issue