From aabb67519f36c002e2593278f50fdd9b8caf24b0 Mon Sep 17 00:00:00 2001 From: Felix Pankratz Date: Sat, 13 Aug 2022 17:18:31 +0200 Subject: [PATCH 1/3] fix shebang --- build-ff.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-ff.sh b/build-ff.sh index 660ca52..908eb9d 100644 --- a/build-ff.sh +++ b/build-ff.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash PWD=$(pwd) BASE_DIR=${PWD}/base MANIFEST_DIR=${PWD}/firefox @@ -12,4 +12,4 @@ rm -f ${OUT} cd "$BASE_DIR" || return zip -r ${OUT} * cd "${MANIFEST_DIR}" || return -zip -r ${OUT} manifest.json \ No newline at end of file +zip -r ${OUT} manifest.json From 9f277d4af044257fde8e046b9b7d58f1fa7d93a2 Mon Sep 17 00:00:00 2001 From: Felix Pankratz Date: Sat, 13 Aug 2022 17:38:42 +0200 Subject: [PATCH 2/3] fix build script --- build-ff.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/build-ff.sh b/build-ff.sh index 908eb9d..db2873e 100644 --- a/build-ff.sh +++ b/build-ff.sh @@ -2,14 +2,19 @@ PWD=$(pwd) BASE_DIR=${PWD}/base MANIFEST_DIR=${PWD}/firefox -OUT="../out/artifacts/firefox/extension.zip" +OUTPUT_DIR=${PWD}/out/artifacts/firefox +OUTPUT_FILE=${OUTPUT_DIR}/extension.zip echo $BASE_DIR echo $MANIFEST_DIR -echo $OUT -rm -f ${OUT} -cd "$BASE_DIR" || return -zip -r ${OUT} * -cd "${MANIFEST_DIR}" || return -zip -r ${OUT} manifest.json +mkdir -p ${OUTPUT_DIR} + +# check if file exists before removing +[ -f ${OUTPUT_FILE} ] && rm -f ${OUTPUT_FILE} + +pushd ${BASE_DIR} +zip -r ${OUTPUT_FILE} * +popd +pushd ${MANIFEST_DIR} +zip ${OUTPUT_FILE} manifest.json From 459492b131ddbbfa62581a17d92229b88e694db7 Mon Sep 17 00:00:00 2001 From: Felix Pankratz Date: Sat, 13 Aug 2022 17:39:39 +0200 Subject: [PATCH 3/3] add missing popd --- build-ff.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build-ff.sh b/build-ff.sh index db2873e..52ceb70 100644 --- a/build-ff.sh +++ b/build-ff.sh @@ -18,3 +18,4 @@ zip -r ${OUTPUT_FILE} * popd pushd ${MANIFEST_DIR} zip ${OUTPUT_FILE} manifest.json +popd