From 241b2fe2dd39d66dd2ddc7fc06114f40231e776a Mon Sep 17 00:00:00 2001
From: Ilya Lesikov <bititanc@gmail.com>
Date: Tue, 5 Nov 2019 15:08:43 +0300
Subject: [PATCH] fix tarball, flatpak and appimage build scripts

Build image changed from ubuntu 18.04 to 18.10 since flatpak-builder
in 18.04 doesn't have source type 'dir' implemented yet
---
 .gitlab-ci.yml                                       | 2 +-
 appimage/build_appimage.sh                           | 5 +++--
 binary_tarball/scripts/1_Install_Dependencies.sh     | 2 +-
 binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 4 ++--
 flatpak/build_flatpak.sh                             | 4 +++-
 flatpak/content/io.gitlab.LibreWolf.json             | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f230b82..20e9899 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: ubuntu:18.04
+image: ubuntu:18.10
 
 variables:
     BINARY_TARBALL: "$CI_PROJECT_DIR/LibreWolf.tar.bz2"
diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index b74e98c..9936a6b 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -14,7 +14,7 @@ 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;
+_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;
@@ -40,7 +40,8 @@ chmod +x $_APPIMAGETOOL_FILE;
 
 # Generate AppImage
 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; 
 
 # Move AppImage to specified location
diff --git a/binary_tarball/scripts/1_Install_Dependencies.sh b/binary_tarball/scripts/1_Install_Dependencies.sh
index 49f0613..58cde9b 100755
--- a/binary_tarball/scripts/1_Install_Dependencies.sh
+++ b/binary_tarball/scripts/1_Install_Dependencies.sh
@@ -2,7 +2,7 @@
 printf "\n\n-------------------------------------- DEPENDENCY INSTALLATION ---------------------------------------------\n";
 
 # Setup Script Variables
-_DEPENDENCIES="mercurial wget git";
+_DEPENDENCIES="mercurial wget git flatpak flatpak-builder";
 
 # Installs Dependencies
 printf "\nInstalling dependencies: $_DEPENDENCIES\n";
diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
index 0e6551e..fe4a4a6 100755
--- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
+++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
@@ -11,7 +11,7 @@ _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
 
 # Extracts the binary tarball
 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
 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
 printf "\nRecompressing binary tarball\n";
-tar -jvcf $BINARY_TARBALL $_EXTRACTED_TARBALL_FOLDER;
+tar -jvcf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER .;
 
 
diff --git a/flatpak/build_flatpak.sh b/flatpak/build_flatpak.sh
index 999c710..40645ab 100755
--- a/flatpak/build_flatpak.sh
+++ b/flatpak/build_flatpak.sh
@@ -23,11 +23,13 @@ flatpak install -y flathub $_FLATHUB_PACKAGES_TO_INSTALL;
 
 # Extracts the binary tarball
 printf "\nExtracting librewolf binary tarball\n";
+mkdir -p $_EXTRACTED_BINARY_TARBALL_FOLDER;
 tar -xvf $BINARY_TARBALL -C $_EXTRACTED_BINARY_TARBALL_FOLDER;
 
 # Prepare for flatpak build
 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
 printf "\nBuilding flatpak repository\n";
diff --git a/flatpak/content/io.gitlab.LibreWolf.json b/flatpak/content/io.gitlab.LibreWolf.json
index 0e2b549..ccf95dd 100644
--- a/flatpak/content/io.gitlab.LibreWolf.json
+++ b/flatpak/content/io.gitlab.LibreWolf.json
@@ -13,7 +13,7 @@
         ],
         "sources": [{
             "type": "dir",
-            "path": "source"
+            "path": "flatpak/source"
          }]
     }],
     "finish-args": [