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

update: ignore non-submodule changes at top-level (#31) 

and check if /dev/tty exists before using it
This commit is contained in:
Ștefan Talpalaru 2021-11-30 12:52:33 +01:00 committed by GitHub
parent 3b83e22943
commit 59dfbda0da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefiles/targets.mk
View File

@ -85,8 +85,9 @@ build-nim: | sanity-checks
# Check if the update might cause loss of work. Abort, if so, while allowing an override mechanism.
update-test:
TEE_TO_TTY="cat"; if [[ -e /dev/tty ]]; then TEE_TO_TTY="tee /dev/tty"; fi; \
COMMAND="git status --short --untracked-files=no --ignore-submodules=untracked"; \
LINES=$$({ $${COMMAND} | grep . && echo ^---top level || true; git submodule foreach --recursive --quiet "$${COMMAND} | grep . && echo ^---\$$name || true"; } | tee /dev/tty | wc -l); \
LINES=$$({ $${COMMAND} | grep 'vendor' && echo ^---top level || true; git submodule foreach --recursive --quiet "$${COMMAND} | grep . && echo ^---\$$name || true"; } | $${TEE_TO_TTY} | wc -l); \
if [[ "$${LINES}" -ne "0" && "$(OVERRIDE)" != "1" ]]; then echo -e "\nYou have uncommitted local changes which might be overwritten by the update. Aborting.\nIf you know better, you can re-run the command with OVERRIDE=1.\n"; exit 1; fi
#- for each submodule, delete checked out files (that might prevent a fresh checkout); skip dotfiles