From 492249e80df68e79baf17319919ed865d222ac6d Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink@protonmail.com>
Date: Tue, 23 Jul 2019 12:38:46 -0500
Subject: [PATCH] Fix all builds

---
 .gitlab-ci.yml                                         |  7 +++++--
 browser/linux/appimage/build_appimage.sh               |  2 +-
 .../scripts/5_Configure_Binary_Tarball.sh              |  2 +-
 browser/linux/flatpak/build_flatpak.sh                 | 10 +++++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 693cef3..75229f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,13 +11,16 @@ Build Linux Packages:
         - ./build.sh
     artifacts:
         paths:
-            - "browser/linux/LibreWolf.tar.bz2"
+            - "LibreWolf.tar.bz2"
+            - "LibreWolf.AppImage"
+            - "librewolf-flatpak-repo"
+            - "LibreWolf.flatpak"
 
 Release to Gitlab:
   stage: Release
   image: python3
   script:
     - pip3 install gitlab-release
-    - gitlab-release browser/linux/build_output/*
+    - gitlab-release LibreWolf.tar.bz2 LibreWolf.AppImage librewolf-flatpak-repo LibreWolf.flatpak
   only:
     - tags
diff --git a/browser/linux/appimage/build_appimage.sh b/browser/linux/appimage/build_appimage.sh
index 43330bc..436f5f7 100755
--- a/browser/linux/appimage/build_appimage.sh
+++ b/browser/linux/appimage/build_appimage.sh
@@ -34,7 +34,7 @@ rm -rf $_APPIMAGETOOL_EXTRACTED_FOLDER;
 chmod +x $_BUILD_APPIMAGE_FILE; 
 
 # Move AppImage to specified location
-printf "\nMoving AppImage to build_output folder\n";
+printf "\nMoving AppImage to specified location\n";
 mv $_BUILD_APPIMAGE_FILE $APPIMAGE_FILE;
 
 
diff --git a/browser/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/browser/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
index c7dd3b7..293dc16 100755
--- a/browser/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
+++ b/browser/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
@@ -13,7 +13,7 @@ tar -xvf $BINARY_TARBALL;
 
 # Adds the librefox config files to the packaged tarball
 printf "\nCopying librewolf settings to extracted binary tarball\n";
-cp -r $SETTINGS_FOLDER $_EXTRACTED_TARBALL_FOLDER$/settings;
+cp -r $SETTINGS_FOLDER $_EXTRACTED_TARBALL_FOLDER/settings;
 cp $LAUNCHER_SCRIPT $_EXTRACTED_TARBALL_FOLDER/launch_librewolf.sh;
 
 # Repacks the binary tarball
diff --git a/browser/linux/flatpak/build_flatpak.sh b/browser/linux/flatpak/build_flatpak.sh
index db8168e..411b387 100755
--- a/browser/linux/flatpak/build_flatpak.sh
+++ b/browser/linux/flatpak/build_flatpak.sh
@@ -20,14 +20,14 @@ _FLATPAK_BUILD_FOLDER=build-dir;
 # Install flatpak
 printf "\nInstalling flatpak\n";
 echo $_APT_REPO >> $_APT_SOURCE_LIST;
-apt update && apt install -y gnupg2 && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys $_APT_REPO_KEY;
-apt update;
-apt install -y $_APT_PACKAGES_TO_INSTALL;
+apt-get -qq update && apt-get -qqy install gnupg2 && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys $_APT_REPO_KEY;
+apt-get -qq update;
+apt-get -qqy install $_APT_PACKAGES_TO_INSTALL;
 
 # Install build dependencies
 printf "\nInstalling flatpak build dependencies\n";
 flatpak remote-add --if-not-exists $_FLATHUB_REPO;
-flatpak install -y $_FLATHUB_PACKAGES_TO_INSTALL;
+flatpak install -y flathub $_FLATHUB_PACKAGES_TO_INSTALL;
 
 # Extracts the binary tarball
 printf "\nExtracting librewolf binary tarball\n";
@@ -35,7 +35,7 @@ tar -xvf $BINARY_TARBALL;
 
 # Prepare for flatpak build
 printf "\nPreparing files for flatpak build\n";
-mkdir $_FLATPAK_BUILD_SOURCE_FOLDER && mv -r $_EXTRACTED_BINARY_TARBALL_FOLDER $_FLATPAK_BUILD_SOURCE_FOLDER/librewolf;
+mkdir $_FLATPAK_BUILD_SOURCE_FOLDER && mv $_EXTRACTED_BINARY_TARBALL_FOLDER $_FLATPAK_BUILD_SOURCE_FOLDER/librewolf;
 
 # Build Repo and standalone bundle
 printf "\nBuilding flatpak repository and bundle\n";