diff options
| author | BeatLink <beatlink@protonmail.com> | 2019-07-16 12:25:21 -0500 |
|---|---|---|
| committer | BeatLink <beatlink@protonmail.com> | 2019-07-16 12:25:21 -0500 |
| commit | 581640e00db889fc7b848d27ea7c8b06ed1eee48 (patch) | |
| tree | 1ddff44978ca97633d8137d29c81287a0b45e4a6 | |
| parent | Fix flatpak build (diff) | |
| download | librewolf-linux-581640e00db889fc7b848d27ea7c8b06ed1eee48.tar.gz librewolf-linux-581640e00db889fc7b848d27ea7c8b06ed1eee48.tar.bz2 librewolf-linux-581640e00db889fc7b848d27ea7c8b06ed1eee48.zip | |
Fix Flatpak
| -rwxr-xr-x | browser/linux/build.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/browser/linux/build.sh b/browser/linux/build.sh index 5153ee8..ff1a45c 100755 --- a/browser/linux/build.sh +++ b/browser/linux/build.sh @@ -17,7 +17,6 @@ BRANDING_FOLDER=$SOURCE_FOLDER/browser/branding/librewolf; ICON_FOLDER=$REPOSITORY_FOLDER/branding/icon/; PACKAGE_FILE="librewolf*.tar.bz2"; APPIMAGE_RESOURCE_FOLDER=$SCRIPT_FOLDER/resources/appimage; -FLATPAK_MANIFEST_FILE=$SCRIPT_FOLDER/resources/flatpak/io.gitlab.LibreWolf.json; printf "SCRIPT_FOLDER: $SCRIPT_FOLDER\n"; printf "REPOSITORY_FOLDER: $REPOSITORY_FOLDER\n"; printf "SOURCE_FOLDER: $SOURCE_FOLDER\n"; @@ -25,7 +24,6 @@ printf "BRANDING_FOLDER: $BRANDING_FOLDER\n"; printf "ICON_FOLDER: $ICON_FOLDER\n"; printf "PACKAGE_FILE: $PACKAGE_FILE\n"; printf "APPIMAGE_RESOURCE_FOLDER: $APPIMAGE_RESOURCE_FOLDER\n"; -printf "FLATPAK_MANIFEST_FILE: $FLATPAK_MANIFEST_FILE\n"; printf "\n\n-------------------------------------- PREBUILD ---------------------------------------------\n"; @@ -180,17 +178,18 @@ apt install -y flatpak flatpak-builder; # Install build dependencies printf "\nInstalling flatpak build dependencies\n"; flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo; -flatpak install -y org.gnome.Platform//3.32 org.gnome.Sdk//3.32; +flatpak install -y org.gnome.Platform/x86_64/3.32 org.gnome.Sdk/x86_64/3.32; # Prepare for flatpak build printf "\nPreparing files for flatpak build\n"; mkdir "source"; cp -r ./librewolf ./source/librewolf; +cp $SCRIPT_FOLDER/resources/flatpak/io.gitlab.LibreWolf.json ./io.gitlab.LibreWolf.json; # Build Repo and standalone bundle printf "\nBuilding flatpak repository and bundle\n"; -flatpak-builder --repo=librewolf-flatpak-repo build-dir $FLATPAK_MANIFEST_FILE; -flatpak build-bundle librewolf-flatpak-repo LibreWolf.flatpak $FLATPAK_MANIFEST_FILE master; +flatpak-builder --repo=librewolf-flatpak-repo build-dir io.gitlab.LibreWolf.json; +flatpak build-bundle librewolf-flatpak-repo LibreWolf.flatpak io.gitlab.LibreWolf master; # move repo and bundle to build output here printf "\nMoving repository and bundle to build output folder\n"; |