Fix build script

main
Elbert Alias 7 years ago
parent e96fb5ba30
commit db0e2c4dcd

@ -13,10 +13,9 @@ RUN apk update && apk add --no-cache \
optipng \ optipng \
zip zip
RUN mkdir -p /usr/share && \ # Fixes PhantomJS
cd /usr/share \ # https://github.com/dustinblackman/phantomized
&& curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar xj \ RUN curl -Ls "https://github.com/dustinblackman/phantomized/releases/download/2.1.1a/dockerized-phantomjs.tar.gz" | tar xz -C /
&& ln -s /usr/share/phantomjs/phantomjs /usr/bin/phantomjs
RUN apk del \ RUN apk del \
curl curl

@ -2,17 +2,31 @@
cd "$(dirname $0)/.." cd "$(dirname $0)/.."
version="$2"
if [[ -z "$version" ]]; then
current=$(grep '"version":' src/drivers/webextension/manifest.json | sed 's/^.*"version": "\(.*\)".*$/\1/')
echo "No version specified. Current version is $current."
exit 1;
fi
set -eu set -eu
./bin/validate ./bin/validate
echo "Deleting junk files..."
find . -name ".DS_Store" -exec rm {} \;
echo "Prettifying apps.json..." echo "Prettifying apps.json..."
jsonlint-cli -ist $'\t' src/apps.json jsonlint-cli -ist $'\t' src/apps.json
echo "Converting SVG icons to PNG..." echo "Converting SVG icons to PNG..."
#svg2png-many -i src/icons/ -o src/icons/converted/ --width=32 --height=32 svg2png-many -i src/icons/ -o src/icons/converted/ --width=32 --height=32
echo "Compressing PNG icons..." echo "Compressing PNG icons..."
@ -23,6 +37,9 @@ optipng -quiet "src/icons/converted/*.png"
set -e set -e
# NPM
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/" src/drivers/npm/package.json
# WebExtension # WebExtension
echo "Building WebExtension..." echo "Building WebExtension..."
@ -30,6 +47,8 @@ webextension_dir=src/drivers/webextension
pushd $webextension_dir > /dev/null pushd $webextension_dir > /dev/null
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/" manifest.json
zip -qr ../../../build/wappalyzer_webextension.zip . zip -qr ../../../build/wappalyzer_webextension.zip .
popd > /dev/null popd > /dev/null
@ -45,6 +64,8 @@ manifest_dir="Wappalyzer/edgeextension/manifest"
mv $webextension_dir/manifest.json $webextension_dir/manifest.webextension.json mv $webextension_dir/manifest.json $webextension_dir/manifest.webextension.json
mv $webextension_dir/manifest.edge.json $webextension_dir/manifest.json mv $webextension_dir/manifest.edge.json $webextension_dir/manifest.json
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/" $webextension_dir/manifest.json
manifoldjs -l debug -p edgeextension -f edgeextension -m $webextension_dir/manifest.json manifoldjs -l debug -p edgeextension -f edgeextension -m $webextension_dir/manifest.json
# Replace symlinks with actual files # Replace symlinks with actual files
@ -74,4 +95,4 @@ rm -rf Wappalyzer
popd > /dev/null popd > /dev/null
echo "Done." echo "Done (v$version)."

@ -2,8 +2,7 @@
"dependencies": { "dependencies": {
"file-type": "3.8.*", "file-type": "3.8.*",
"is-svg": "2.0.*", "is-svg": "2.0.*",
"read-chunk": "2.0.*", "read-chunk": "2.0.*"
"svg2png-many": "*"
} }
} }

@ -2,7 +2,7 @@
"name": "wappalyzer", "name": "wappalyzer",
"description": "Uncovers the technologies used on websites", "description": "Uncovers the technologies used on websites",
"homepage": "https://github.com/AliasIO/Wappalyzer", "homepage": "https://github.com/AliasIO/Wappalyzer",
"version": "5.1.1", "version": "5.1.2",
"author": "Elbert Alias", "author": "Elbert Alias",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {

@ -4,7 +4,7 @@
"author": "Elbert Alias", "author": "Elbert Alias",
"homepage_url": "https://wappalyzer.com/", "homepage_url": "https://wappalyzer.com/",
"description": "Identify web technologies", "description": "Identify web technologies",
"version": "5.1.1", "version": "5.1.2",
"default_locale": "en", "default_locale": "en",
"manifest_version": 2, "manifest_version": 2,
"icons": { "icons": {

@ -4,7 +4,7 @@
"author": "Elbert Alias", "author": "Elbert Alias",
"homepage_url": "https://wappalyzer.com/", "homepage_url": "https://wappalyzer.com/",
"description": "Identify web technologies", "description": "Identify web technologies",
"version": "5.1.1", "version": "5.1.2",
"default_locale": "en", "default_locale": "en",
"manifest_version": 2, "manifest_version": 2,
"icons": { "icons": {
@ -43,7 +43,7 @@
}, },
{ {
"matches": [ "matches": [
"http://*/*", "http://*/*",
"https://*/*" "https://*/*"
], ],
"js": [ "js": [

Loading…
Cancel
Save