Dont sync capstone all the time

.github/workflows/ci.yml

@@ -16,13 +16,14 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Setting up bad libnames
+    - name: Building r2 without network access
       run: |
         ./preconfigure
         echo UNPLUG
         sudo rm -f /etc/resolv.conf || true
         ping av.com || true
-        sys/install.sh
+        ./configure --with-rpath --prefix=/usr
+        make -j ; sudo make install
   build-oldlibs:
     name: linux-acr-oldlibsbug
     runs-on: ubuntu-20.04

libr/asm/arch/arm/v35arm64/Makefile

@@ -16,6 +16,7 @@ EXT_AR?=a
 
 clean:
 	rm -rf arch-arm64 arm64dis.$(EXT_AR)
+	rm -rf arch-armv7 armv7dis.$(EXT_AR)
 
 mrproper: clean
 	rm -rf arch-arm64

libr/util/spp.mk

@@ -9,7 +9,7 @@ $(SPPPATH)/config.h: $(SPPPATH)/config.def.h
 	$(MAKE) spp_config
 
 spp_config:
-	cmp $(SPPPATH)/config.def.h $(SPPPATH)/config.h || \
+	cmp $(SPPPATH)/config.def.h $(SPPPATH)/config.h 2> /dev/null || \
 		cp -f $(SPPPATH)/config.def.h $(SPPPATH)/config.h
 	$(MAKE) spp_build
 

preconfigure

@@ -3,25 +3,29 @@ if [ ! -f config-user.mk ]; then
   printf "[*] Configuring the build system ... "
   ./configure || exit 1
 fi
-printf "[*] Checking out capstone... "
-rm -rf shlr/capstone
+
+# env setup
 MAKE=make
 gmake --version > /dev/null 2>&1
 [ $? = 0 ] && MAKE=gmake
+
+# checks
+printf "[*] Checking out capstone... "
+rm -rf shlr/capstone
 ${MAKE} -C shlr capstone > /dev/null 2>&1 || exit 1
 echo OK
 
 V35WD=libr/asm/arch/arm/v35arm64
 printf "[*] Checking out vector35-arm64... "
 if [ ! -d "${V35WD}/arch-arm64/.git" ]; then
-	rm -rf ${WD}/arch-arm64
+	rm -rf ${V35WD}/arch-arm64
 	${MAKE} -C ${V35WD} arch-arm64 > /dev/null || exit 1
 fi
 echo OK
 
 printf "[*] Checking out vector35-armv7... "
 if [ ! -d "${V35WD}/arch-armv7/.git" ]; then
-	rm -rf ${WD}/arch-armv7
+	rm -rf ${V35WD}/arch-armv7
 	${MAKE} -C ${V35WD} arch-armv7 > /dev/null || exit 1
 fi
 echo OK

shlr/Makefile

@@ -252,7 +252,9 @@ 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}" "${CS_ARCHIVE_URL}"
+	if [ ! -d capstone ]; then \
+		"$(SHELL)" capstone.sh "${CS_URL}" "${CS_BRA}" "${CS_TIP}" "${CS_REV}" "${CS_ARCHIVE_URL}" ; \
+	fi
 endif
 
 .PHONY: capstone capstone-sync

shlr/capstone.sh

@@ -66,6 +66,9 @@ git_clone() {
 }
 
 get_capstone() {
+	if [ -d capstone ]; then
+		return
+	fi
 	git_clone || fatal_msg 'Clone failed'
 	cd capstone || fatal_msg 'Failed to chdir'
 	parse_capstone_tip

sys/install.sh

@@ -112,7 +112,9 @@ else
 	fi
 fi
 
-./preconfigure
+if [ ! -d shlr/capstone ]; then
+	./preconfigure
+fi
 
 if [ "${M32}" = 1 ]; then
 	${SHELL} ./sys/build-m32.sh ${ARGS} || exit 1