status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace usage of `make setup` 

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Pedro Pombeiro 2019-04-09 21:02:39 +02:00
parent fe80c7841e
commit cf6cbd7fa8
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/Jenkinsfile.nix.macos
View File

@ -28,7 +28,7 @@ pipeline {
stages { stages {
stage('Setup') { stage('Setup') {
steps { steps {
sh 'make setup' sh 'scripts/setup'
sh """ sh """
. ~/.nix-profile/etc/profile.d/nix.sh && \ . ~/.nix-profile/etc/profile.d/nix.sh && \
nix-env -i openssh nix-env -i openssh

2
default.nix
View File

@ -95,7 +95,7 @@ with pkgs;
lib.optionalString targetMobile statusMobile.shellHook + lib.optionalString targetMobile statusMobile.shellHook +
'' ''
if [ -n "$ANDROID_SDK_ROOT" ] && [ ! -d "$ANDROID_SDK_ROOT" ]; then 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 fi
set +e set +e
''; '';

2
scripts/lib/setup/installers.sh
View File

@ -20,7 +20,7 @@ function install_nix() {
if is_linux && [ -f ~/.bashrc ] && ! grep -qF ".nix-profile/etc/profile.d/nix.sh" ~/.bashrc; then 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. # 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 # 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 fi
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then

6
scripts/run-environment-check.sh
View File

@ -31,7 +31,7 @@ if [ -z "$IN_NIX_SHELL" ]; then
echo -e " \t\tfound\t\t$(node -v) ($(which node))" echo -e " \t\tfound\t\t$(node -v) ($(which node))"
echo -e " - yarn:\texpected\t${EXPECTED_YARN_VERSION}" echo -e " - yarn:\texpected\t${EXPECTED_YARN_VERSION}"
echo -e " \t\tfound\t\t$(yarn -v) ($(which yarn))" 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}" echo -e "**********************************************************************************************${NC}"
exit 1 exit 1
@ -40,11 +40,11 @@ fi
if [ "$PLATFORM" == 'android' ]; then if [ "$PLATFORM" == 'android' ]; then
if [ ! -d $ANDROID_SDK_ROOT ]; 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 exit 1
fi fi
if [ ! -d $ANDROID_NDK_ROOT ]; then 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 exit 1
fi fi
elif [ "$PLATFORM" == 'ios' ] && [ "$(uname)" != "Darwin" ]; then elif [ "$PLATFORM" == 'ios' ] && [ "$(uname)" != "Darwin" ]; then