From 1a2790f4a0b92abc580f630fc4cd6f174acb0b6b Mon Sep 17 00:00:00 2001 From: David Byers <david.byers@liu.se> Date: Wed, 3 Feb 2021 12:09:12 +0100 Subject: [PATCH] Fix build script. --- .gitlab-ci.yml | 9 ++++----- scripts/build.sh | 20 +++++++++++++++----- shared/manifest.part.json | 2 +- site/index.html | 6 ++++-- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 124cf93..b868e0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,21 +6,20 @@ stages: build: stage: build script: - - cat /etc/issue - - uname -a - apt-get -y update - apt-get -y install zip - - cd extension - - zip -r ../safelinks-cleaner-thunderbird.xpi * + - bash scripts/build.sh artifacts: paths: - - ./safelinks-cleaner-thunderbird.xpi + - ./build/safelinks-cleaner-thunderbird.xpi + - ./build/safelinks-cleaner-firefox.xpi pages: stage: deploy script: - cp -r site .public - cp safelinks-cleaner-thunderbird.xpi .public + - cp safelinks-cleaner-firefox.xpi .public - mv .public public - ls -lr public artifacts: diff --git a/scripts/build.sh b/scripts/build.sh index 5b5adfb..cf28299 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,20 +1,30 @@ #! /bin/bash +set -eu TARGETS=(thunderbird firefox) -BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +BASEDIR="$( cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null 2>&1 && pwd )" BUILDDIR="$BASEDIR/build" SHAREDDIR="$BASEDIR/shared" for target in "${TARGETS[@]}" ; do targetdir="$BUILDDIR/$target" - sourcedir="$basedir/$target" + sourcedir="$BASEDIR/$target" outputfile="$BUILDDIR/safelinks-cleaner-$target.xpi" + echo "[+] building target '$target'" [ -d "$targetdir" ] && rm -r "$targetdir" mkdir -p "$targetdir" - cp -r "$SHAREDDIR"/* "$sourcedir"/* "$targetdir" - cd "$targetdir" - zip -r ../"$outputfile" * + + cp -r "$SHAREDDIR"/* "$targetdir" + cp -r "$sourcedir"/* "$targetdir" + rm "$targetdir"/manifest.part.json + + python3 "$BASEDIR/scripts/makemanifest.py" \ + "$SHAREDDIR/manifest.part.json" \ + "$sourcedir/manifest.part.json" \ + > "$targetdir/manifest.json" + (cd "$targetdir" ; zip -r "$outputfile" *) + echo "[-] output to '$outputfile'" done diff --git a/shared/manifest.part.json b/shared/manifest.part.json index 764aa8a..0ad066e 100644 --- a/shared/manifest.part.json +++ b/shared/manifest.part.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "ATP Safe Links Cleaner", "description": "__MSG_extensionDescription__", - "version": "1.3", + "version": "1.4", "author": "David Byers", "homepage_url": "https://gitlab.liu.se/safelinks/safelinks-cleaner/", "default_locale": "en", diff --git a/site/index.html b/site/index.html index 51c263a..ad650cb 100644 --- a/site/index.html +++ b/site/index.html @@ -1,8 +1,10 @@ <html> <head> - <title>safelinks-cleaner-mailextension</title> + <title>Safe Links Cleaner</title> </head> <body> - <a href="safelinks-cleaner-thunderbird.xpi">Download latest version</a> + <a href="safelinks-cleaner-thunderbird.xpi">Download latest version for thunderbird</a> + <br /> + <a href="safelinks-cleaner-firefox.xpi">Download latest version for firefox</a> </body> </html> -- GitLab