summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhackademix2018-10-06 02:47:31 +0200
committerhackademix2018-10-06 02:47:31 +0200
commit37303cc5b5cd94bb4ed29b95c63faa91f37c572c (patch)
tree5cc6dddccef179e8fffc51f88bcc7cadb93ac530
parent55ccd14dfe85351d722ed1de5966426d7b54c523 (diff)
downloadnoscript-37303cc5b5cd94bb4ed29b95c63faa91f37c572c.tar.gz
noscript-37303cc5b5cd94bb4ed29b95c63faa91f37c572c.tar.xz
noscript-37303cc5b5cd94bb4ed29b95c63faa91f37c572c.zip
Option to force TLD updates.
-rw-r--r--build.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 8663a44..4133825 100644
--- a/build.sh
+++ b/build.sh
@@ -38,7 +38,7 @@ if [ "$1" == "bump" ]; then
echo "Bumping to $VER"
git add "$MANIFEST_IN"
git commit -m "Version bump: $VER."
- [[ $VER == *rc* ]] || "$0" tag
+ [[ $VER == *rc* ]] || "$0" tag
exit
fi
XPI_DIR="$BASE/xpi"
@@ -46,7 +46,7 @@ XPI="$XPI_DIR/noscript-$VER"
LIB="$SRC/lib"
TLD="$BASE/TLD"
-if ! [ $(date -r "$LIB/tld.js" +'%Y%m%d') -ge $(date +'%Y%m%d') ] && "$TLD/generate.sh" "$LIB/tld.js"; then
+if ! [ $(date -r "$LIB/tld.js" +'%Y%m%d') -ge $(date +'%Y%m%d') -a "$1" != "tld" ] && "$TLD/generate.sh" "$LIB/tld.js"; then
cp -u "$TLD/tld.js" "$LIB"
fi
@@ -58,7 +58,7 @@ cp -p LICENSE.txt GPL.txt "$BUILD"/
BUILD_CMD="web-ext"
BUILD_OPTS="build"
-
+
if [[ $VER == *rc* ]]; then
sed -re 's/^(\s+)"strict_min_version":.*$/\1"update_url": "https:\/\/secure.informaction.com\/update\/?v='$VER'",\n\0/' \
"$MANIFEST_IN" > "$MANIFEST_OUT"