Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-25 03:43:25 +01:00
Code Issues Releases Wiki Activity

Make uAssets a submodule

Browse Source
This commit is contained in:
Manish Jethani 2021-07-29 19:36:49 +05:30
parent 5560071468
commit 63591ef2aa
6 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@ -19,9 +19,7 @@ jobs:
persist-credentials: false persist-credentials: false
- name: Clone uAssets - name: Clone uAssets
run: | run: |
pushd .. git submodule update --depth 1 --init
git clone --depth 1 https://github.com/uBlockOrigin/uAssets.git
popd
# https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html # https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
- name: Get release information - name: Get release information
id: release_info id: release_info

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "submodules/uAssets"]
path = submodules/uAssets
url = https://github.com/uBlockOrigin/uAssets.git

1
submodules/uAssets Submodule

@ -0,0 +1 @@
Subproject commit fabf04d2e6761a733cef539a57267e5133ffb6c9

17
tools/make-assets.sh
View File

@ -11,15 +11,8 @@ cp -R ./assets $DES/
mkdir $DES/thirdparties mkdir $DES/thirdparties
# Use existing uAssets, or git-clone a temporary one git submodule update --depth 1 --init
if [ -d "../uAssets" ]; then UASSETS=submodules/uAssets
UASSETS=../uAssets
else
echo "*** ../uAssets not present, git-cloning..."
TMPDIR=$(mktemp -d)
UASSETS=$TMPDIR/uAssets
git clone --depth=1 https://github.com/uBlockOrigin/uAssets.git $UASSETS
fi
cp -R $UASSETS/thirdparties/easylist-downloads.adblockplus.org $DES/thirdparties/ cp -R $UASSETS/thirdparties/easylist-downloads.adblockplus.org $DES/thirdparties/
cp -R $UASSETS/thirdparties/pgl.yoyo.org $DES/thirdparties/ cp -R $UASSETS/thirdparties/pgl.yoyo.org $DES/thirdparties/
@ -30,9 +23,3 @@ mkdir $DES/ublock
cp -R $UASSETS/filters/* $DES/ublock/ cp -R $UASSETS/filters/* $DES/ublock/
# Optional filter lists: do not include in package # Optional filter lists: do not include in package
rm $DES/ublock/annoyances.txt rm $DES/ublock/annoyances.txt
# Remove temporary git-clone uAssets
if [ -n "$TMPDIR" ]; then
echo "*** Removing temporary $TMPDIR"
rm -rf $TMPDIR
fi

4
tools/make-browser.sh
View File

@ -25,9 +25,9 @@ cp -R src/lib/publicsuffixlist $DES/lib/
cp -R src/lib/regexanalyzer $DES/lib/ cp -R src/lib/regexanalyzer $DES/lib/
mkdir -p $DES/data mkdir -p $DES/data
cp -R ../uAssets/thirdparties/publicsuffix.org/list/* \ cp -R submodules/uAssets/thirdparties/publicsuffix.org/list/* \
$DES/data $DES/data
cp -R ../uAssets/thirdparties/easylist-downloads.adblockplus.org/* \ cp -R submodules/uAssets/thirdparties/easylist-downloads.adblockplus.org/* \
$DES/data $DES/data
cp platform/browser/*.html $DES/ cp platform/browser/*.html $DES/

17
tools/make-nodejs.sh
View File

@ -21,15 +21,8 @@ cp -R src/lib/punycode.js $DES/lib/
cp -R src/lib/publicsuffixlist $DES/lib/ cp -R src/lib/publicsuffixlist $DES/lib/
cp -R src/lib/regexanalyzer $DES/lib/ cp -R src/lib/regexanalyzer $DES/lib/
# Use existing uAssets, or git-clone a temporary one git submodule update --depth 1 --init
if [ -d "../uAssets" ]; then UASSETS=submodules/uAssets
UASSETS=../uAssets
else
echo "*** ../uAssets not present, git-cloning..."
TMPDIR=$(mktemp -d)
UASSETS=$TMPDIR/uAssets
git clone --depth=1 https://github.com/uBlockOrigin/uAssets.git $UASSETS
fi
# https://github.com/uBlockOrigin/uBlock-issues/issues/1664#issuecomment-888332409 # https://github.com/uBlockOrigin/uBlock-issues/issues/1664#issuecomment-888332409
THIRDPARTY=$UASSETS/thirdparties/publicsuffix.org THIRDPARTY=$UASSETS/thirdparties/publicsuffix.org
@ -42,12 +35,6 @@ node -pe "JSON.stringify(fs.readFileSync('$THIRDPARTY/easylist.txt', 'utf8'))" \
node -pe "JSON.stringify(fs.readFileSync('$THIRDPARTY/easyprivacy.txt', 'utf8'))" \ node -pe "JSON.stringify(fs.readFileSync('$THIRDPARTY/easyprivacy.txt', 'utf8'))" \
> $DES/data/easyprivacy.json > $DES/data/easyprivacy.json
# Remove temporary git-clone uAssets
if [ -n "$TMPDIR" ]; then
echo "*** Removing temporary $TMPDIR"
rm -rf $TMPDIR
fi
cp platform/nodejs/*.js $DES/ cp platform/nodejs/*.js $DES/
cp platform/nodejs/*.json $DES/ cp platform/nodejs/*.json $DES/
cp LICENSE.txt $DES/ cp LICENSE.txt $DES/