diff --git a/platform/safari/Info.plist b/platform/safari/Info.plist index 900b236b5f78e..a7f722456fe1a 100644 --- a/platform/safari/Info.plist +++ b/platform/safari/Info.plist @@ -92,6 +92,8 @@ All + Update Manifest URL + https://raw.githubusercontent.com/el1t/uBlock-Safari-releases/master/Update.plist Website https://www.github.com/el1t/uBlock-Safari diff --git a/platform/safari/Update.plist b/platform/safari/Update.plist index 1b0c141a4fe76..b8c51b1808c7a 100644 --- a/platform/safari/Update.plist +++ b/platform/safari/Update.plist @@ -6,15 +6,15 @@ CFBundleIdentifier - net.gorhill.uBlock + com.el1t.uBlock Developer Identifier - 96G4BAKDQ9 + 3NU33NW2M3 CFBundleShortVersionString {version} CFBundleVersion {buildNumber} URL - https://chrismatic.io/ublock/ublock-latest.safariextz + https://raw.githubusercontent.com/el1t/uBlock-Safari-releases/master/uBlock0.safariextz diff --git a/tools/make-safari.sh b/tools/make-safari.sh index db6537a686519..1f5a8980337c4 100755 --- a/tools/make-safari.sh +++ b/tools/make-safari.sh @@ -28,12 +28,13 @@ cp platform/safari/Settings.plist $DES/ cp LICENSE.txt $DES/ # https://github.com/el1t/uBlock-Safari/issues/4 -echo '*** uBlock0.safariextension: Adding extensions to extensionless assets...' +echo -n '*** uBlock0.safariextension: Adding extensions to extensionless assets...' find $DES/assets/thirdparties -type f -regex '.*\/[^.]*' -exec mv {} {}.txt \; +echo ' ✔' # Declare __MSG__ scripts inside client-injected.js # Beware: this removes all newlines within each script -echo '*** uBlock0.safariextension: Injecting scripts into vapi-client...' +echo -n '*** uBlock0.safariextension: Injecting scripts into vapi-client...' awkscript='BEGIN { p = 0 } /^\/\/ __MSG__/ { p = 1 @@ -56,9 +57,11 @@ if ! sed "${sedargs[@]}" $DES/js/vapi-client.js 2>/dev/null; then sed ${sedargs[@]} $DES/js/vapi-client.js fi rm -f $DES/js/client-injected.js +echo ' ✔' -echo '*** uBlock0.safariextension: Generating Info.plist...' +echo -n '*** uBlock0.safariextension: Generating Info.plist...' python tools/make-safari-meta.py $DES/ +echo ' ✔' if [ "$1" = all ]; then if [ ! -f dist/certs/key.pem ] || [ ! -f dist/certs/SafariDeveloper.cer ]; then @@ -67,10 +70,19 @@ if [ "$1" = all ]; then fi echo -n '*** uBlock0.safariextension: Creating signed extension...' if ! bash ./tools/make-safari-sign.sh "$DES"; then + echo echo '*** uBlock0.safariextension: Error signing extension' exit 1 fi - echo ' done.' + echo ' ✔' + + RELEASES=../uBlock-releases + if [ -d "$RELEASES" ]; then + echo -n '*** uBlock0.safariextension: Copying into releases directory...' + cp "${DES/safariextension/safariextz}" "$RELEASES" + cp "$DES/../Update.plist" "$RELEASES" + echo ' ✔' + fi fi echo '*** uBlock0.safariextension: Done.'