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

Consistent filesystem path quoting in shell scripts.

This commit is contained in:
hackademix 2018-08-02 01:50:09 +02:00
parent 99e8c8b09f
commit a97176845d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TLD/generate.sh
View File

@ -3,13 +3,13 @@ BASE=$(dirname "$0")
pushd "$BASE"
fname=public_suffix_list.dat
nflag=""
if [ -f $fname ]; then
if [ -f "$fname" ]; then
nflag="-z $fname"
fi
URL=https://publicsuffix.org/list/$fname
curl -O $nflag "$URL"
if ! grep 'com' $fname >/dev/null; then
if ! grep 'com' "$fname" >/dev/null; then
echo >&2 "$fname empty or corrupt!"
exit 1
fi

12
build.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
BASE=$PWD
BASE="$PWD"
SRC="$BASE/src"
BUILD="$BASE/build"
MANIFEST_IN="$SRC/manifest.json"
@ -24,7 +24,7 @@ LIB="$SRC/lib"
TLD="$BASE/TLD"
if ! [ $(date -r "$LIB/tld.js" +'%Y%m%d') -ge $(date +'%Y%m%d') ] && "$TLD/generate.sh"; then
cp -u "$TLD/tld.js" $LIB
cp -u "$TLD/tld.js" "$LIB"
fi
./html5_events/html5_events.pl
@ -44,9 +44,9 @@ if ! grep '"id":' "$MANIFEST_OUT" >/dev/null; then
exit 1
fi
for file in $SRC/content/*.js; do
if grep -P '\/\/\s(REL|DEV)_ONLY' $file >/dev/null; then
sed -re 's/\s*\/\/\s*(\S.*)\s*\/\/\s*REL_ONLY.*/\1/' -e 's/.*\/\/\s*DEV_ONLY.*//' $file > $BUILD/content/$(basename $file)
for file in "$SRC"/content/*.js; do
if grep -P '\/\/\s(REL|DEV)_ONLY' "$file" >/dev/null; then
sed -re 's/\s*\/\/\s*(\S.*)\s*\/\/\s*REL_ONLY.*/\1/' -e 's/.*\/\/\s*DEV_ONLY.*//' "$file" > "$BUILD"/content/$(basename "$file")
fi
done
@ -61,7 +61,7 @@ fi
echo "Creating $XPI.xpi..."
mkdir -p "$XPI_DIR"
"$BUILD_CMD" $BUILD_OPTS --source-dir=$(cygpath -w $BUILD) --artifacts-dir=$(cygpath -w $XPI_DIR) --ignore-files=test/XSS_test.js
"$BUILD_CMD" $BUILD_OPTS --source-dir=$(cygpath -w "$BUILD") --artifacts-dir=$(cygpath -w "$XPI_DIR") --ignore-files=test/XSS_test.js
SIGNED="$XPI_DIR/noscript_security_suite-$VER-an+fx.xpi"
if [ -f "$SIGNED" ]; then
mv "$SIGNED" "$XPI.xpi"