toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed makefile for run-android (#340)

Browse source
This commit is contained in:
Saturnino Abril 2017-03-13 23:04:29 +09:00 committed by Harrison Healey
parent 6324f22095
commit 13c624b722
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -7,7 +7,7 @@ ios_target := $(filter-out build-ios,$(MAKECMDGOALS))
android_target := $(filter-out build-android,$(MAKECMDGOALS))
.npminstall: package.json
@if ! [ $(shell command -v npm) ]; then \
@if ! [ $(shell command -v npm 2> /dev/null) ]; then \
echo "npm is not installed"; \
exit 1; \
fi
@ -58,15 +58,15 @@ run-android: | start prepare-android-build
echo "ANDROID_HOME is not set"; \
exit 1; \
fi
@if ! [ $(shell command -v adb) ]; then \
@if ! [ $(shell command -v adb 2> /dev/null) ]; then \
echo "adb is not installed"; \
exit 1; \
fi
@if ! [ $(shell adb get-state) == "device" ]; then \
echo "no android device or emulator is running"; \
exit 1; \
fi
@if ! [ $(shell command -v watchman) ]; then \
ifneq ($(shell adb get-state),device)
echo "no android device or emulator is running"
exit 1;
endif
@if ! [ $(shell command -v watchman 2> /dev/null) ]; then \
echo "watchman is not installed"; \
exit 1; \
fi