diff --git a/build-ff.sh b/build-ff.sh
index 660ca52..52ceb70 100644
--- a/build-ff.sh
+++ b/build-ff.sh
@@ -1,15 +1,21 @@
-#!/usr/bin/bash
+#!/bin/bash
 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
\ No newline at end of file
+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
+popd