Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 21:29:49 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix #6032 - Honor --without-pull for capstone and www-m

Browse Source
This commit is contained in:
pancake 2017-10-20 03:19:55 +02:00
parent 5a96c229e7
commit ef2965d3f8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shlr/Makefile
View File

@ -242,12 +242,16 @@ else
capstone: capstone-sync
capstone-sync:
ifeq ($(WITHOUT_PULL),1)
@echo "Nothing to sync because of --without-pull"
else
"$(SHELL)" capstone.sh "${CS_URL}" "${CS_BRA}" "${CS_TIP}" "${CS_REV}"
ifeq ($(CS_PATCHES),1)
-cd capstone ; $(GIT) reset --hard
#cd capstone ; for PATCH in ../capstone-patches/* ; do patch -tp1 < $$PATCH ; done
cd capstone ; for PATCH in ../capstone-patches/* ; do patch -p1 < $$PATCH ; done
endif
endif
.PHONY: capstone
endif
@ -270,7 +274,11 @@ endif
cd ../.. ; git clone --depth 1 https://github.com/radare/radare2-webui
../../radare2-webui/dist/m: ../../radare2-webui
cd ../../radare2-webui/www/m ; git pull ; npm install ; $(MAKE) release
ifeq ($(WITHOUT_PULL),1)
cd ../../radare2-webui/www/m && npm i ; $(MAKE) release
else
cd ../../radare2-webui/www/m && git pull ; npm i ; $(MAKE) release
endif
www-sync-m sync-www-m: ../../radare2-webui/dist/m
cp -rf ../../radare2-webui/dist/m www/m.tmp

1
sys/install.sh
View File

@ -27,6 +27,7 @@ if [ "$1" != "--without-pull" ]; then
fi
fi
else
export WITHOUT_PULL=1
shift
fi