From 83f3b6604b4954d8a2813cb4dc1106fef828d6b1 Mon Sep 17 00:00:00 2001
From: BeatLink <beatlink@protonmail.com>
Date: Fri, 26 Jul 2019 00:16:56 -0500
Subject: Simplify and compartmentalise scripts, separate packaging into gitlab
 jobs

---
 browser/linux/appimage/build_appimage.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'browser/linux/appimage')

diff --git a/browser/linux/appimage/build_appimage.sh b/browser/linux/appimage/build_appimage.sh
index 436f5f7..4ca7bf0 100755
--- a/browser/linux/appimage/build_appimage.sh
+++ b/browser/linux/appimage/build_appimage.sh
@@ -1,15 +1,18 @@
 #!/bin/sh
 printf "\n\n------------------------------------ APPIMAGE BUILD -----------------------------------------\n";
 
+# Aborts the script upon any faliure
+set -e;
+
 # Sets up script variables
 BINARY_TARBALL=$1
-APPIMAGE_CONTENT_FOLDER=$2
-APPIMAGE_FILE=$3
+APPIMAGE_FILE=$2
 _BINARY_TARBALL_EXTRACTED_FOLDER=./librewolf;
 _BUILD_APPIMAGE_FILE=./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
 
 # Extracts the binary tarball
 printf "\nExtracting librewolf binary tarball\n";
@@ -17,7 +20,7 @@ tar -xvf $BINARY_TARBALL;
 
 # Copy appimage resources to main tarball
 printf "Copying AppImage resources to binary tarball folder\n";
-cp -vrT $APPIMAGE_CONTENT_FOLDER $_BINARY_TARBALL_EXTRACTED_FOLDER;
+cp -vrT $_APPIMAGE_CONTENT_FOLDER $_BINARY_TARBALL_EXTRACTED_FOLDER;
 
 # Downloads appimage tool
 printf "\nDownloading AppImage Tool\n";
-- 
cgit