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.

Sign up for GitHub

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

Added option to override GOOGLE_CHROME detection; eg. for Chromium users (reopened #113) #114

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added option to override GOOGLE_CHROME detection; eg. for Chromium users (reopened #113) #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90715c5
Added option to override GOOGLE_CHROME detection; eg. for Chromium users
ljrk0 Apr 2, 2015
8a31183
added .gitignore to ignore binary_name
ljrk0 Apr 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
binary_name
5 changes: 4 additions & 1 deletion browser-ext/login/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ CFX=$(BUILD_DIR)/../../third_party/firefox-addon-sdk/bin/cfx

CLOSURE_STRICT_FLAGS=--language_in ECMASCRIPT5_STRICT --warning_level VERBOSE --compilation_level ADVANCED_OPTIMIZATIONS --externs externs_node.js --jscomp_error missingProperties --jscomp_error checkTypes --jscomp_error checkRegExp --jscomp_error accessControls --jscomp_error const --jscomp_error missingReturn

ifeq ($(shell uname),Darwin)
ifneq ($(shell cat binary_name),)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't this an environment variable? The use of a file in this way seems a bit strange to me.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, ye. I wrote this when I was a bit tired. An env-var seems more reasonable.

GOOGLE_CHROME=$(shell cat binary_name)
$(info Found binary_name file; Setting $$GOOGLE_CHROME to [${GOOGLE_CHROME}])
else ifeq ($(shell uname),Darwin)
GOOGLE_CHROME="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
else
GOOGLE_CHROME=google-chrome
Expand Down