Mirrors
/
noscript
mirror of https://github.com/hackademix/noscript.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed regression causing only signed builds to complete.

This commit is contained in:
hackademix 2022-03-28 12:39:14 +02:00
parent 177cebe674
commit 15e82f2ea2
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
build.sh
View File

@ -141,6 +141,24 @@ build() {
build
SIGNED="$XPI_DIR/noscript_security_suite-$VER-an+fx.xpi"
if [ -f "$SIGNED" ]; then
mv "$SIGNED" "$XPI.xpi"
elif [ -f "$XPI.zip" ]; then
SIGNED=""
if unzip -l "$XPI.xpi" | grep "META-INF/mozilla.rsa" >/dev/null 2>&1; then
echo "A signed $XPI.xpi already exists, not overwriting."
else
[[ "$VER" == *rc* ]] && xpicmd="mv" || xpicmd="cp"
$xpicmd "$XPI.zip" "$XPI$DBG.xpi"
echo "Created $XPI$DBG.xpi"
fi
else
echo >&2 "ERROR: Could not create $XPI$DBG.xpi!"
exit 3
fi
ln -fs $XPI.xpi "$BASE/latest.xpi"
# create Chromium pre-release
BUILD_CMD="$CHROMIUM_BUILD_CMD"
@ -184,22 +202,6 @@ fi
mv "$BUILD" "$CHROMIUM_UNPACKED"
# Cleanup and publish
SIGNED="$XPI_DIR/noscript_security_suite-$VER-an+fx.xpi"
if [ -f "$SIGNED" ]; then
mv "$SIGNED" "$XPI.xpi"
if [ "$SIGNED" ]; then
../../we-publish "$XPI.xpi"
elif [ -f "$XPI.zip" ]; then
if unzip -l "$XPI.xpi" | grep "META-INF/mozilla.rsa" >/dev/null 2>&1; then
echo "A signed $XPI.xpi already exists, not overwriting."
else
[[ "$VER" == *rc* ]] && xpicmd="mv" || xpicmd="cp"
$xpicmd "$XPI.zip" "$XPI$DBG.xpi"
echo "Created $XPI$DBG.xpi"
fi
else
echo >&2 "ERROR: Could not create $XPI$DBG.xpi!"
exit 3
fi
ln -fs $XPI.xpi "$BASE/latest.xpi"