improve build-package

build-package

@@ -24,14 +24,17 @@ fi
 for opt in ${@}; do
 	case ${opt} in
 		full)
+			check_nanodroid || error "run nanodroid-pull first!"
 			mk_pkg_full
 		;;
 
 		microg )
+			check_nanodroid || error "run nanodroid-pull first!"
 			mk_pkg_microg
 		;;
 
 		fdroid )
+			check_nanodroid || error "run nanodroid-pull first!"
 			mk_pkg_fdroid
 		;;
 
@@ -48,6 +51,7 @@ for opt in ${@}; do
 		;;
 
 		all )
+			check_nanodroid || error "run nanodroid-pull first!"
 			mk_pkg_full
 			mk_pkg_microg
 			mk_pkg_fdroid

data/build-package.common

@@ -12,10 +12,12 @@ check_nanodroid () {
 	done
 
 	if [[ ${NANODROID_MISSING_FILES} -ne 0 ]]; then
-		rm -f ${CWD}/.nanodroid-pull
 		echo -e "\nThe following files are missing:\n"
 		printf '%s\n' ${missing_database[@]}
-	else	echo -e "\nNanoDroid correctly populated\n"
+		return 1
+	else
+		echo -e "\nNanoDroid correctly populated\n"
+		return 0
 	fi
 }
 

data/build-package.pkg-fdroid

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 create_fdroid_package() {
-	[[ ! -f "${CWD}/.nanodroid-pull" ]] && \
-		error "run \"build-package pull\" first!"
-
 	ZIP="${CWD}/NanoDroid-fdroid-${VERSION}".zip
 	rm -f "${ZIP}"
 

data/build-package.pkg-full

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 create_full_package () {
-	[[ ! -f "${CWD}/.nanodroid-pull" ]] && \
-		error "run \"build-package pull\" first!"
-
 	ZIP="${CWD}/NanoDroid-${VERSION}".zip
 	rm -f "${ZIP}"
 

data/build-package.pkg-microg

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 create_microg_package() {
-	[[ ! -f "${CWD}/.nanodroid-pull" ]] && \
-		error "run \"build-package pull\" first!"
-
 	ZIP="${CWD}/NanoDroid-microG-${VERSION}".zip
 	rm -f "${ZIP}"
 

data/build-package.update

@@ -6,8 +6,6 @@ nanodroid_pull () {
 	update_apps
 	update_swipe
 	update_gsync
-
-	touch "${CWD}/.nanodroid-pull"
 }
 
 update_swipe () {