From 3dfc48697b526187a82e6d8be4ca9e6b2292a350 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink@protonmail.com>
Date: Fri, 26 Jul 2019 20:17:11 -0500
Subject: [PATCH] fix flatpak and appimage build

---
 .gitlab-ci.yml                           |  2 +-
 browser/linux/appimage/build_appimage.sh | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b9ac52..e75d36e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,7 @@ Build Flatpak:
     tags:
         - gitlab-org
     script:
-        - ./browser/linux/flatpak/build_flatpak.sh
+        - ./browser/linux/flatpak/build_flatpak.sh $BINARY_TARBALL $FLATPAK_REPO $FLATPAK_BUNDLE
     artifacts:
         name: "Librewolf-$CI_COMMIT_REF_NAME-Linux-Flatpak"
         paths:
diff --git a/browser/linux/appimage/build_appimage.sh b/browser/linux/appimage/build_appimage.sh
index 4ca7bf0..69453a3 100755
--- a/browser/linux/appimage/build_appimage.sh
+++ b/browser/linux/appimage/build_appimage.sh
@@ -7,12 +7,13 @@ set -e;
 # Sets up script variables
 BINARY_TARBALL=$1
 APPIMAGE_FILE=$2
-_BINARY_TARBALL_EXTRACTED_FOLDER=./librewolf;
-_BUILD_APPIMAGE_FILE=./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=./squashfs-root;
-_APPIMAGETOOL_FILE=./appimagetool;
-_APPIMAGE_CONTENT_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";