Skip to content

Commit 37303cc

Browse files
committed
Option to force TLD updates.
1 parent 55ccd14 commit 37303cc

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ if [ "$1" == "bump" ]; then
3838
echo "Bumping to $VER"
3939
git add "$MANIFEST_IN"
4040
git commit -m "Version bump: $VER."
41-
[[ $VER == *rc* ]] || "$0" tag
41+
[[ $VER == *rc* ]] || "$0" tag
4242
exit
4343
fi
4444
XPI_DIR="$BASE/xpi"
4545
XPI="$XPI_DIR/noscript-$VER"
4646
LIB="$SRC/lib"
4747
TLD="$BASE/TLD"
4848

49-
if ! [ $(date -r "$LIB/tld.js" +'%Y%m%d') -ge $(date +'%Y%m%d') ] && "$TLD/generate.sh" "$LIB/tld.js"; then
49+
if ! [ $(date -r "$LIB/tld.js" +'%Y%m%d') -ge $(date +'%Y%m%d') -a "$1" != "tld" ] && "$TLD/generate.sh" "$LIB/tld.js"; then
5050
cp -u "$TLD/tld.js" "$LIB"
5151
fi
5252

@@ -58,7 +58,7 @@ cp -p LICENSE.txt GPL.txt "$BUILD"/
5858

5959
BUILD_CMD="web-ext"
6060
BUILD_OPTS="build"
61-
61+
6262
if [[ $VER == *rc* ]]; then
6363
sed -re 's/^(\s+)"strict_min_version":.*$/\1"update_url": "https:\/\/secure.informaction.com\/update\/?v='$VER'",\n\0/' \
6464
"$MANIFEST_IN" > "$MANIFEST_OUT"

0 commit comments

Comments
 (0)