commit 315379186 on 20211024

BuildAPKs · Oct 24, 2021 · 7a0da1e · 7a0da1e · SDRausty · Oct 24, 2021
1 parent 32d72f1
commit 7a0da1e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 31 deletions.
diff --git a/.conf/VERSIONID b/.conf/VERSIONID
@@ -1 +1 @@
-0.0.231
+0.0.232
diff --git a/build.repo.bash b/build.repo.bash
@@ -11,36 +11,40 @@ then # print help
 	exit
 fi
 _ANTBUILD_() {
-ANTBUILD="$(find "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" -type f -name build.xml)"
-if [[ -n "${ANTBUILD:-}" ]]
-then
-	for BUILDXML in $ANTBUILD
-	do
-		printf '%s\n' "ant build in directory ${BUILDXML%/*} begun"
-		cd "${BUILDXML%/*}" ; pwd ; ant ||:
-		printf '%s\n' "ant build in directory $(pwd) done"
-	done
-fi
+	ANTBUILD="$(find "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" -type f -name build.xml)"
+	if [[ -n "${ANTBUILD:-}" ]]
+	then
+		for BUILDXML in $ANTBUILD
+		do
+			printf '%s\n' "ant build in directory ${BUILDXML%/*} begun"
+			cd "${BUILDXML%/*}" ; pwd ; ant ||:
+			printf '%s\n' "ant build in directory $PWD done"
+		done
+	fi
 }
 _COMBUILD_() {
-COMPILSH="$(find "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" -type f -name compile.sh)"
-if [[ -n "${COMPILSH:-}" ]]
-then
-	for COMPFILE in $COMPILSH
-	do
-		printf '%s\n' "compile.sh in directory ${COMPFILE%/*} begun"
-		cd "${COMPFILE%/*}" ; pwd ; sh "$COMPFILE" ||:
-		printf '%s\n' "compile.sh in directory $(pwd) done"
-	done
-fi
+	COMPILSH="$(find "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" -type f -name compile.sh)"
+	if [[ -n "${COMPILSH:-}" ]]
+	then
+		for COMPFILE in $COMPILSH
+		do
+			printf '%s\n' "compile.sh in directory ${COMPFILE%/*} begun"
+			cd "${COMPFILE%/*}" ; sh "$COMPFILE" ||:
+			printf '%s\n' "compile.sh in directory $PWD done"
+		done
+	fi
 }
-_CLONEBUILD_() {
-	cd "$RDR/sources/$SITENAME/$LOGINAME" && git clone --depth 1 "$@" --single-branch && cd "$REPONAME" && (_IAR_ "$(pwd)" || _SIGNAL_ "135" "${0##*/} _CLONEBUILD_ _IAR_")
+_DOBUILD_() {
+ 	cd "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" && (_IAR_ "$PWD" || _SIGNAL_ "135" "${0##*/} _CLONEBUILD_ _IAR_")
 	cd "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" && printf "\\e[1;38;5;151mFound %s APK files in ~/%s/.\\n\\n\\e[0m" "$(find "$PWD" -type f -name "*apk" | wc -l)" "$(cut -d"/" -f7-99 <<< "$PWD")" && _COMBUILD_
 	cd "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" && printf "\\e[1;38;5;151mFound %s APK files in ~/%s/.\\n\\n\\e[0m" "$(find "$PWD" -type f -name "*apk" | wc -l)" "$(cut -d"/" -f7-99 <<< "$PWD")" && _ANTBUILD_
 	cd "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" && printf "\\e[1;38;5;151mFound %s APK files in ~/%s/.\\n\\n\\e[0m" "$(find "$PWD" -type f -name "*apk" | wc -l)" "$(cut -d"/" -f7-99 <<< "$PWD")" && "$RDR/scripts/bash/build/build.in.dir.bash"
 	cd "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" && printf "\\e[1;38;5;151mFound %s APK files in ~/%s/.\\n\\n\\e[0m" "$(find "$PWD" -type f -name "*apk" | wc -l)" "$(cut -d"/" -f7-99 <<< "$PWD")"
 }
+_CLONEBUILD_() {
+	cd "$RDR/sources/$SITENAME/$LOGINAME" && git clone --depth 1 "$@" --single-branch || _SIGNAL_ "135" "${0##*/} _CLONEBUILD_ git clone"
+	_DOBUILD_
+}
 BASENAME="${@%/}" # strip trailing slash
 BASENAME="${BASENAME#*//}" # strip before double slash
 REPONAME="${BASENAME##*/}" # strip before last slash
@@ -56,12 +60,7 @@ printf "%s\\n" "Processing $@ in directory ~/${RDR##*/}/sources/$SITENAME/$LOGIN
 . "$RDR"/scripts/bash/shlibs/buildAPKs/prep.bash
 if [ -d "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" ]
 then
- 	cd "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" && (_IAR_ "$(pwd)" || _SIGNAL_ "135" "${0##*/} _CLONEBUILD_ _IAR_")
-
-cd "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" && printf "\\e[1;38;5;151mFound %s APK files in ~/%s/.\\n\\n\\e[0m" "$(find "$PWD" -type f -name "*apk" | wc -l)" "$(cut -d"/" -f7-99 <<< "$PWD")" && _COMBUILD_
-cd "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" && printf "\\e[1;38;5;151mFound %s APK files in ~/%s/.\\n\\n\\e[0m" "$(find "$PWD" -type f -name "*apk" | wc -l)" "$(cut -d"/" -f7-99 <<< "$PWD")" && _ANTBUILD_
-cd "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" && printf "\\e[1;38;5;151mFound %s APK files in ~/%s/.\\n\\n\\e[0m" "$(find "$PWD" -type f -name "*apk" | wc -l)" "$(cut -d"/" -f7-99 <<< "$PWD")" && "$RDR/scripts/bash/build/build.in.dir.bash"
-cd "$RDR/sources/$SITENAME/$LOGINAME/$REPONAME" && printf "\\e[1;38;5;151mFound %s APK files in ~/%s/.\\n\\n\\e[0m" "$(find "$PWD" -type f -name "*apk" | wc -l)" "$(cut -d"/" -f7-99 <<< "$PWD")"
+_DOBUILD_
 elif [ -d "$RDR/sources/$SITENAME/$LOGINAME" ]
 then
 	_CLONEBUILD_ "$@"

diff --git a/sha512.sum b/sha512.sum
@@ -1,4 +1,4 @@
-007814c8d896b46e89ad62ca66f2ad6db89ab0fd2ac9391cc3c0d7e5530dfa2949441a12158d3bbcd802d005c36e987a563b4260923b3018478f8d5d1da1aebb  ./.conf/VERSIONID
+95ecd642f1cba47fca4db53dffadbe74293c4d216eb5cc4f32d06c7a4e849160d0fcbc61feff724be9f54df4492f7af4c4dca60c4ccb50dc66f3f1f447a9ee9d  ./.conf/VERSIONID
 05a502a845e35bc0495a3a3006ae914785c48679dddd362bd98bd33c306ed2aa8fac57344b1b65955d41755c3967f3e991770764f6c2f14c6a52f3e52e00ef1c  ./.github/FUNDING.yml
 ec770c00aa2c6225a2e27e8f08bd3d1eb8882f2cde94c820ab48db0b0fb0175913cd43a851904ff015c95f1fa31bb787383608cf19eb9d34f572b5fa8f9250ab  ./.github/workflows/greetings.yml
 5e20f4451f28b2ad8cd03e174bafa7c5d2d08cb3d9c6364a1f36b47fa1a2ae7e222970337f1481f149b6f87894f59e113bc49924776d558f0eb0773f6eebcd56  ./.github/workflows/label.yml
@@ -11,7 +11,7 @@ fdbfc92756d0db9f2d22583ad4842e04d6064482e6a88be8fa76f13f790121d04b77442f6348d575
 4a02c661251587cc49e9f3ed06e8842ab293bd7774b2b6c314624039e3b5c21792df54d91971dcacfb117c9e010e9a91b78d3341266042d0dae8d397a1fe8dfc  ./build.github.sequential.bash
 72772f5c17a060f86cdf2be2b31324f5a2f2939194aabe389df3d20c55810f1e4a85cc4c2c6f5b46364bf86ed20ab861a3b6499f7b7dc6baf1240b87a2e872c6  ./build.github.tarballs.bash
 e4431e7a8594f63bc7e8721dc1f6eaf01fe1c2aac004481102c8dd032404ccc6fb453987c92aa15da3f7e12bdecdb4aebbd3b27b6c7f9fa3a1be1e10765d9f93  ./build.github.topics.bash
-3ac924879bade8c2fa6e0d985d0b8a5091eb1d5ec40a26c0f36e1c04c5e29da6354ff464dfaa22c49eba8de780626eac1b296a76800f04c5253fb7ac0ae1f6ab  ./build.repo.bash
+0a169e18c0652d60f575b0dbc7185614f87c825c3e9597a811309c5ebbb58b16ba19b68daa2211e580546dad482a68112f0bd45242717e5a8e56631620ac59a8  ./build.repo.bash
 db597b0d88f9153f42aa8996a42b339529bcd21396e8dd1e219169625349c0ae309bf10b54f09ebf0517df2785df24df288388cbe453d380de004301ed175548  ./download.github.bash
 1f2a9bcd76a6795e7eed0f4fc05f7746a0db905116badac5af9a8a8b479d3a6e1ec416507c99dff5b0f768a965f71bb8699a81eb555b93c2fe8693d6e817e3f2  ./scripts/bkp/build.github.topics.bkp.bash
 27e409f0253d8b21d1d45c305b94b56ede348597d6962d9537d52d57ce0007bc14fa46819532ccda86c940ebb1a20f7c2d2505322ee16dbe3dcfc1757d848343  ./scripts/bkp/build.github.topics30.bash