From cf6cbd7fa8b70726e1e2fa1a69829e583f324372 Mon Sep 17 00:00:00 2001
From: Pedro Pombeiro <pombeirp@users.noreply.github.com>
Date: Tue, 9 Apr 2019 21:02:39 +0200
Subject: [PATCH] Replace usage of `make setup`

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
---
 ci/Jenkinsfile.nix.macos         | 2 +-
 default.nix                      | 2 +-
 scripts/lib/setup/installers.sh  | 2 +-
 scripts/run-environment-check.sh | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/Jenkinsfile.nix.macos b/ci/Jenkinsfile.nix.macos
index 511af35d43..00f5c6eecb 100644
--- a/ci/Jenkinsfile.nix.macos
+++ b/ci/Jenkinsfile.nix.macos
@@ -28,7 +28,7 @@ pipeline {
   stages {
     stage('Setup') {
       steps {
-        sh 'make setup'
+        sh 'scripts/setup'
         sh """
           . ~/.nix-profile/etc/profile.d/nix.sh && \
           nix-env -i openssh
diff --git a/default.nix b/default.nix
index 85aced1ed3..d0015e1796 100644
--- a/default.nix
+++ b/default.nix
@@ -95,7 +95,7 @@ with pkgs;
       lib.optionalString targetMobile statusMobile.shellHook +
       ''
         if [ -n "$ANDROID_SDK_ROOT" ] && [ ! -d "$ANDROID_SDK_ROOT" ]; then
-          ./scripts/setup # we assume that if the Android SDK dir does not exist, make setup needs to be run
+          ./scripts/setup # we assume that if the Android SDK dir does not exist, setup script needs to be run
         fi
         set +e
       '';
diff --git a/scripts/lib/setup/installers.sh b/scripts/lib/setup/installers.sh
index 2251822395..ca8cd81286 100755
--- a/scripts/lib/setup/installers.sh
+++ b/scripts/lib/setup/installers.sh
@@ -20,7 +20,7 @@ function install_nix() {
       if is_linux && [ -f ~/.bashrc ] && ! grep -qF ".nix-profile/etc/profile.d/nix.sh" ~/.bashrc; then
         # For some reason, new terminals are not started as login shells, so .profile and .bash_profile are not sourced.
         # To get around it, we add Nix initialization to .bashrc as well, if it exists
-        echo "if [ -e ${HOME}/.nix-profile/etc/profile.d/nix.sh ]; then . ${HOME}/.nix-profile/etc/profile.d/nix.sh; fi # added by make setup Status script" >> ~/.bashrc
+        echo "if [ -e ${HOME}/.nix-profile/etc/profile.d/nix.sh ]; then . ${HOME}/.nix-profile/etc/profile.d/nix.sh; fi # added by Status' setup script" >> ~/.bashrc
       fi
 
       if [ $? -eq 0 ]; then
diff --git a/scripts/run-environment-check.sh b/scripts/run-environment-check.sh
index b5e4e47995..179572bf74 100755
--- a/scripts/run-environment-check.sh
+++ b/scripts/run-environment-check.sh
@@ -31,7 +31,7 @@ if [ -z "$IN_NIX_SHELL" ]; then
     echo -e "  \t\tfound\t\t$(node -v) ($(which node))"
     echo -e "  - yarn:\texpected\t${EXPECTED_YARN_VERSION}"
     echo -e "  \t\tfound\t\t$(yarn -v) ($(which yarn))"
-    echo -e "Please open another console to reload the environment, and then run 'make setup' if necessary."
+    echo -e "Please open another console to reload the environment."
 
     echo -e "**********************************************************************************************${NC}"
     exit 1
@@ -40,11 +40,11 @@ fi
 
 if [ "$PLATFORM" == 'android' ]; then
   if [ ! -d $ANDROID_SDK_ROOT ]; then
-    echo -e "${GREEN}NDK setup not complete, please run 'make setup'!${NC}"
+    echo -e "${GREEN}NDK setup not complete, please run 'scripts/setup'!${NC}"
     exit 1
   fi
   if [ ! -d $ANDROID_NDK_ROOT ]; then
-    echo -e "${GREEN}NDK setup not complete, please run 'make setup'!${NC}"
+    echo -e "${GREEN}NDK setup not complete, please run 'scripts/setup'!${NC}"
     exit 1
   fi
 elif [ "$PLATFORM" == 'ios' ] && [ "$(uname)" != "Darwin" ]; then