From 52cdb73e96257569199a370c10c830f840c6c255 Mon Sep 17 00:00:00 2001
From: Mamy Ratsimbazafy <mamy_github@numforge.co>
Date: Tue, 3 Dec 2019 19:52:54 +0100
Subject: [PATCH] Fix instr when cloning from scratch (#621)

* Fix build instruction (make update deps is not enough on first install)

* use underline instead of bold

* Alternative fix

* Makefile: fix the default target on fresh clone

* fix ANSI escape code bleeding into my shell prompt
---
 Makefile  | 9 +++++++--
 README.md | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e3ada862f..0df0bff25 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,12 @@ TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))
 
 .PHONY: all build-system-checks deps update p2pd test $(TOOLS) clean_eth2_network_simulation_files eth2_network_simulation clean-testnet0 testnet0 clean-testnet1 testnet1 clean
 
+ifeq ($(NIM_PARAMS),)
+# "variables.mk" was not included. We can only execute one target in this state.
+all: | build-system-checks
+else
 all: | build-system-checks $(TOOLS)
+endif
 
 # must be included after the default target
 -include $(BUILD_SYSTEM_DIR)/makefiles/targets.mk
@@ -29,8 +34,8 @@ build-system-checks:
 	@[[ -e "$(BUILD_SYSTEM_DIR)/makefiles" ]] || { \
 		echo -e "'$(BUILD_SYSTEM_DIR)/makefiles' not found. Running '$(GIT_SUBMODULE_UPDATE)'.\n"; \
 		$(GIT_SUBMODULE_UPDATE); \
-		echo -e "\nYou can now run '$(MAKE)' again."; \
-		exit 1; \
+		echo -e "\n✔️✔️✔️ Successfully fetched all required internal dependencies."; \
+		echo -e "        You should now \e[4mre-run '$(MAKE)' to build Nimbus\e[0m\n"; \
 		}
 
 deps: | deps-common beacon_chain.nims p2pd
diff --git a/README.md b/README.md
index 465103551..d93c522da 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ Once the [prerequisites](#prerequisites) are installed you can connect to testne
 git clone https://github.com/status-im/nim-beacon-chain
 cd nim-beacon-chain
 make                 # This invocation will bootstrap the build system with additional Makefiles
-make update deps     # This will build Nim and all other dependencies
-./connect-to-testnet testnet0
+make testnet0        # This will build Nimbus and all other dependencies
+                     # and connect you to testnet0
 ```
 
 The testnets are restarted once per week, usually on Monday evenings (UTC)) and integrate the changes for the past week.