Skip to content

Commit d1b72fd

Browse files
jlevequelguohan
authored andcommitted
[make reset] Also remove fsroot directory (#2489)
1 parent 36a9678 commit d1b72fd

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

Makefile.work

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,15 @@ init :
166166
reset :
167167
@echo && echo -n "Warning! All local changes will be lost. Proceed? [y/N]: "
168168
@read ans && \
169-
if [ $$ans == y ]; then \
170-
git clean -xfdf; \
171-
git reset --hard; \
172-
git submodule foreach --recursive git clean -xfdf; \
173-
git submodule foreach --recursive git reset --hard; \
174-
git submodule update --init --recursive;\
175-
else \
176-
echo "Reset aborted"; \
177-
fi
169+
if [ $$ans == y ]; then \
170+
echo "Resetting local repository. Please wait..."; \
171+
$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) sudo rm -rf fsroot; \
172+
git clean -xfdf; \
173+
git reset --hard; \
174+
git submodule foreach --recursive git clean -xfdf; \
175+
git submodule foreach --recursive git reset --hard; \
176+
git submodule update --init --recursive; \
177+
echo "Reset complete!"; \
178+
else \
179+
echo "Reset aborted"; \
180+
fi

0 commit comments

Comments
 (0)