Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ghostery: 3.2.0 #1277

Merged
merged 16 commits into from
Aug 23, 2023
Merged
1 change: 0 additions & 1 deletion .node-version

This file was deleted.

1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodejs 12.18.0
ruby 2.6.5
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"images" : [
{
"filename" : "ghostery-wordmark-white (2).png",
"filename" : "ghostery-wordmark-white-1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ghostery-wordmark-white (3).png",
"filename" : "ghostery-wordmark-white-2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ghostery-wordmark-white (4).png",
"filename" : "ghostery-wordmark-white-3x.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Branding/Ghostery/Configuration/GhosteryAdHoc.xcconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Display name
BUNDLE_DISPLAY_NAME = Ghostery Dawn
BUNDLE_DISPLAY_NAME = Ghostery Private Browser

// Bundle Identifier
APP_BUNDLE_ID = com.ghostery.browser.nightly
Expand Down
2 changes: 1 addition & 1 deletion Branding/Ghostery/Configuration/GhosteryDebug.xcconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Display name
BUNDLE_DISPLAY_NAME = Ghostery Dawn
BUNDLE_DISPLAY_NAME = Ghostery Private Browser

// Bundle Identifier
APP_BUNDLE_ID = com.ghostery.browser
Expand Down
2 changes: 1 addition & 1 deletion Branding/Ghostery/Configuration/GhosteryRelease.xcconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Display name
BUNDLE_DISPLAY_NAME = Ghostery Dawn
BUNDLE_DISPLAY_NAME = Ghostery Private Browser

// Bundle Identifier
APP_BUNDLE_ID = com.evidon.Ghostery
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
Copyright © 2020 Cliqz. All rights reserved.
*/

"CFBundleDisplayName" = "In Ghostery Dawn öffnen";
"CFBundleDisplayName" = "In Ghostery Private Browser öffnen";
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
Copyright © 2020 Cliqz. All rights reserved.
*/

"CFBundleDisplayName" = "Open In Ghostery Dawn";
"CFBundleDisplayName" = "Open In Ghostery Private Browser";
6 changes: 3 additions & 3 deletions Branding/Ghostery/Siri/de.lproj/Intents.strings
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"3fYgNr" = "Suchanfrage";

"WogcPW" = "Suche mit Ghostery Dawn";
"WogcPW" = "Suche mit Ghostery Private Browser";

"ZrmRcJ" = "Wonach möchtest du suchen?";

"nChTLr" = "Mit Ghostery Dawn suchen";
"nChTLr" = "Mit Ghostery Private Browser suchen";

"uYCcdq" = "Suche mit Ghostery Dawn";
"uYCcdq" = "Suche mit Ghostery Private Browser";

6 changes: 3 additions & 3 deletions Branding/Ghostery/Siri/en.lproj/Intents.strings
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"3fYgNr" = "Query";

"WogcPW" = "Search With Ghostery Dawn";
"WogcPW" = "Search With Ghostery Private Browser";

"ZrmRcJ" = "What do you want to search?";

"nChTLr" = "Search query with Ghostery Dawn";
"nChTLr" = "Search query with Ghostery Private Browser";

"uYCcdq" = "Search With Ghostery Dawn";
"uYCcdq" = "Search With Ghostery Private Browser";

5 changes: 0 additions & 5 deletions Brewfile

This file was deleted.

22 changes: 7 additions & 15 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,11 @@ else
sh Branding/setup.sh $1 ./
fi

set -e
# nodejs
npm ci
npm run build-user-scripts

brew update
brew bundle

nodenv install -s
eval "$(nodenv init -)"
nodenv exec npm i -g [email protected]
nodenv exec npm ci
nodenv exec npm run build-user-scripts

rbenv install -s
eval "$(rbenv init -)"
rbenv exec gem install bundler
rbenv exec bundle install
rbenv exec bundle exec pod install --repo-update
# ruby
exec gem install bundler
exec bundle install
exec bundle exec pod install --repo-update