From c19b26de4bf5e97253a31231ba8640f7db0b1b1d Mon Sep 17 00:00:00 2001
From: SDRausty <27742457+sdrausty@users.noreply.github.com>
Date: Sun, 3 Nov 2019 01:17:13 -0400
Subject: [PATCH] 	modified:   .conf/VERSIONID 	modified:  
 scripts/bash/build/build.github.bash 	modified:  
 scripts/bash/build/build.github.topics.bash 	deleted:   
 scripts/bash/ushlibs.bash 	modified:   sha512.sum

---
 .conf/VERSIONID                             |   2 +-
 scripts/bash/build/build.github.bash        | 156 +++++++++++++-------
 scripts/bash/build/build.github.topics.bash |  64 ++------
 scripts/bash/ushlibs.bash                   |  64 --------
 sha512.sum                                  |   5 +-
 5 files changed, 115 insertions(+), 176 deletions(-)
 delete mode 100644 scripts/bash/ushlibs.bash

diff --git a/.conf/VERSIONID b/.conf/VERSIONID
index 98527a432..a84947d6f 100644
--- a/.conf/VERSIONID
+++ b/.conf/VERSIONID
@@ -1 +1 @@
-4.4.108
+4.5.0
diff --git a/scripts/bash/build/build.github.bash b/scripts/bash/build/build.github.bash
index 8819cb9ef..0d7a75a93 100755
--- a/scripts/bash/build/build.github.bash
+++ b/scripts/bash/build/build.github.bash
@@ -6,9 +6,9 @@ set -Eeuo pipefail
 shopt -s nullglob globstar
 export RDR="$HOME/buildAPKs"
 . "$RDR"/scripts/bash/init/ushlibs.bash
-. "$RDR"/scripts/bash/shlibs/trap.bash 67 68 69
+. "$RDR"/scripts/bash/shlibs/trap.bash 67 68 69 "${0##*/}"
 
-_AND_ () { # write configuration file for git repository tarball if AndroidManifest.xml file is found in git repositoryr.
+_AND_ () { # writes configuration file for git repository tarball if AndroidManifest.xml file is found in git repositoryr
 	export CK=0
 	printf "%s\\n" "$COMMIT" > "$JDR/.conf/$USER.${NAME##*/}.${COMMIT::7}.ck"
 	printf "%s\\n" "0" >> "$JDR/.conf/$USER.${NAME##*/}.${COMMIT::7}.ck"
@@ -75,7 +75,7 @@ _CKAT_ () {
  	if [[ $CKFILE = "" ]] # configuration file is not found
  	then
  		printf "%s" "Checking $USENAME $REPO for last commit:  " 
-  		COMMIT="$(_GC_)" || _SIGNAL_ "60" "_CKAT_ COMMIT"
+  		COMMIT="$(_GC_)" ||:
  		printf "%s\\n" "Found ${COMMIT::7}; Continuing..."
  		_ATT_ 
  	else # load configuration information from file 
@@ -88,18 +88,75 @@ _CKAT_ () {
 done
 }
 
-_CUTE_ () { # check whether username is an organization
-	. "$RDR"/scripts/bash/shlibs/lock.bash 
-	. "$RDR"/scripts/bash/shlibs/buildAPKs/bnchn.bash bch.st 
-	mapfile -t TYPE < <(curl "https://api.github.com/users/$USER")
-	if [[ "${TYPE[@]}" == *Organization* ]]
-	then
-		export ISUSER=users
-		export ISOTUR=orgs
-	else
+_CUTE_ () { # checks if USENAME is found in GNAMES and if it is an organization or a user
+	if [[ $(grep -iw "$USENAME" "$RDR/var/db/GNAMES" | awk '{print $2}') == User ]] && [[ -f "$RDR/sources/github/users/$USER/profile" ]] && [[ -f "$RDR/sources/github/users/$USER/repos" ]]
+	then 
 		export ISUSER=users
 		export ISOTUR=users
+		export USENAME="$(grep -iw "$USENAME" "$RDR/var/db/GNAMES" | awk '{print $1}')"
+		export JDR="$RDR/sources/github/$ISOTUR/$USER"
+		export JID="git.$ISOTUR.$USER"
+	elif [[ $(grep -iw "$USENAME" "$RDR/var/db/GNAMES" | awk '{print $2}') == Organization ]] && [[ -f "$RDR/sources/github/orgs/$USER/profile" ]] && [[ -f "$RDR/sources/github/orgs/$USER/repos" ]]
+	then 
+		export ISUSER=users
+		export ISOTUR=orgs
+		export USENAME="$(grep -iw "$USENAME" "$RDR/var/db/GNAMES" | awk '{print $1}')"
+		export JDR="$RDR/sources/github/$ISOTUR/$USER"
+		export JID="git.$ISOTUR.$USER"
+	else	# get USENAME and type of USENAME from GitHub
+		mapfile -t TYPE < <(curl "https://api.github.com/users/$USENAME")
+		if [[ "${TYPE[1]}" == *\"message\":\ \"Not\ Found\"* ]]
+		then
+			printf "\\n%s\\n\\n" "Could not find a GitHub login with $USENAME:  Exiting..."
+			exit 44
+		fi
+		if [[ -z "${TYPE[17]}" ]]
+		then
+			_SIGNAL_ "404" "${TYPE[17]} undefined!"
+			exit 34
+		fi
+		USENAME="$(printf "%s" "${TYPE[1]}" | sed 's/"//g' | sed 's/,//g' | awk '{print $2}')" || _SIGNAL_ "73" "_CUTE_ \$USENAME"
+		NAPKS="$(printf "%s" "${TYPE[17]}" | sed 's/"//g' | sed 's/,//g' | awk '{print $2}')" || (_SIGNAL_ "74" "_CUTE_ \$NAPKS: create \$NAPKS failed; Exiting..." && exit 24)
+		if [[ "${TYPE[17]}" == *User* ]]
+		then
+			export ISUSER=users
+			export ISOTUR=users
+		else
+			export ISUSER=users
+			export ISOTUR=orgs
+		fi
+		export JDR="$RDR/sources/github/$ISOTUR/$USER"
+		export JID="git.$ISOTUR.$USER"
+		if [[ ! -d "$JDR" ]] 
+		then
+			mkdir -p "$JDR"
+		fi
+		printf "%s\\n" "${TYPE[@]}" > "$JDR"/profile
+		_NAMESMAINBLOCK_ GNAMES
 	fi
+	if [[ ! -d "$JDR/.conf" ]] 
+	then
+		mkdir -p "$JDR/.conf"
+		printf "%s\\n\\n" "This directory contains results from query for \` AndroidManifest.xml \` files in GitHub $USENAME repositores.  " > "$JDR/.conf/README.md" 
+	fi
+	printf "%s\\n" "Processing $USENAME:"
+	KEYT=("\"login\"" "\"id\"" "\"type\"" "\"name\"" "\"company\"" "\"blog\"" "\"location\"" "\"hireable\"" "\"bio\"" "\"public_repos\"" "\"public_gists\"" "\"followers\"" "\"following\"" "\"created_at\"" )
+	for KEYS in "${KEYT[@]}" # print selected information from profile file 
+	do
+		grep "$KEYS" "$JDR/profile" | sed 's/\,//g' | sed 's/\"//g'
+	done
+	if [[ ! -f "$JDR/repos" ]] 
+	then
+		printf "%s\\n" "Downloading GitHub $USENAME repositories information:  "
+		if [[ "$OAUT" != "" ]] # see $RDR/.conf/GAUTH file for information 
+		then
+			curl -u "$OAUT" "https://api.github.com/$ISUSER/$USER/repos" > "$JDR/repos" 
+		else
+			curl "https://api.github.com/$ISUSER/$USER/repos" > "$JDR/repos" 
+		fi
+	fi
+	_WAKELOCK_
+	. "$RDR"/scripts/bash/shlibs/buildAPKs/bnchn.bash bch.st 
 }
 
 _FJDX_ () { 
@@ -110,18 +167,22 @@ _FJDX_ () {
 _GC_ () { 
 	if [[ "$OAUT" != "" ]] # see $RDR/.conf/GAUTH file for information  
 	then # https://unix.stackexchange.com/questions/117992/download-only-first-few-bytes-of-a-source-page
-	 	curl -u "$OAUT" https://api.github.com/repos/"$USER/$REPO"/commits -s 2>&1 | head -n 3 | tail -n 1 | awk '{ print $2 }' | sed 's/"//g' | sed 's/,//g' 
+	 	curl -u "$OAUT" -r 0-1 https://api.github.com/repos/"$USER/$REPO"/commits -s 2>&1 | head -n 3 | tail -n 1 | awk '{ print $2 }' | sed 's/"//g' | sed 's/,//g' 
 	else
 	 	curl -r 0-1 https://api.github.com/repos/"$USER/$REPO"/commits -s 2>&1 | head -n 3 | tail -n 1 | awk '{ print $2 }' | sed 's/"//g' | sed 's/,//g' 
 	fi
 }
 
-_NAND_ () { # write configuration file for repository if AndroidManifest.xml file is NOT found in git repository.  
+_NAND_ () { # writed configuration file for repository if AndroidManifest.xml file is NOT found in git repository
 	printf "%s\\n" "$COMMIT" > "$JDR/.conf/$USER.${NAME##*/}.${COMMIT::7}.ck"
 	printf "%s\\n" "1" >> "$JDR/.conf/$USER.${NAME##*/}.${COMMIT::7}.ck"
 	printf "\\n%s\\n\\n" "Could not find an AndroidManifest.xml file in Java language repository $USER ${NAME##*/} ${COMMIT::7}:  NOT downloading ${NAME##*/} tarball."
 }
 
+_PRINTAS_ () {
+	printf "\\n\\e[1;34mSearching for AndroidManifest.xml files:\\e[0m\\n"'\033]2;Searching for AndroidManifest.xml files: OK\007'
+}
+
 _PRINTCK_ () {
 	if [[ "$CK" = 1 ]]
 	then
@@ -131,17 +192,17 @@ _PRINTCK_ () {
 	fi
 }
 
-_PRINTJD_() {
+_PRINTJD_ () {
 	printf "\\e[1;32mDONE\\e[0m\\n"
 }
 
-_PRINTJS_() {
+_PRINTJS_ () {
 	printf "\\n\\e[1;34mSearching for Java language repositories: "'\033]2;Searching for Java language repositories: OK\007'
 }
 
 _SIGNAL_ () {
-	STRING="SIGNAL $1 found in $2 ${0##*/}!"
-	printf "\\e[2;2;38;5;208m%s\\e[0m\\n\\n" "$STRING" 
+	STRING="SIGNAL $1 found in $2 ${0##*/} build.github.bash!  Continuing...  "
+	printf "\\e[2;7;38;5;210m%s\\e[0m" "$STRING" 
 }
 
 if [[ -z "${1:-}" ]] 
@@ -158,64 +219,49 @@ export USENAME="${UONE##*/}"
 export USER="${USENAME,,}"
 export OAUT="$(cat "$RDR/.conf/GAUTH" | awk 'NR==1')" # loads login:token key from GAUTH file
 printf "\\n\\e[1;38;5;116m%s\\n\\e[0m" "${0##*/}: Beginning BuildAPKs with build.github.bash $1:"
-. "$RDR/scripts/bash/shlibs/buildAPKs/fandm.bash"
-. "$RDR/scripts/bash/shlibs/buildAPKs/prep.bash"
-. "$RDR/scripts/sh/shlibs/buildAPKs/fapks.sh"
-. "$RDR/scripts/sh/shlibs/buildAPKs/names.sh"
+. "$RDR"/scripts/bash/shlibs/buildAPKs/fandm.bash
+. "$RDR"/scripts/bash/shlibs/buildAPKs/prep.bash
+. "$RDR"/scripts/sh/shlibs/buildAPKs/fapks.sh
+. "$RDR"/scripts/sh/shlibs/buildAPKs/names.sh
+. "$RDR"/scripts/sh/shlibs/mkfiles.sh
+. "$RDR"/scripts/sh/shlibs/mkdirs.sh
+_MKDIRS_ "cache/stash" "cache/tarballs" "db" "db/log" "log/signal"
+_MKFILES_ "db/CNAMES" "db/ENAMES" "db/GNAMES" "db/QNAMES" "db/RNAMES" "db/ZNAMES"
 if grep -iw "$USENAME" "$RDR"/var/db/[PZ]NAMES
-then	# create null directory, repos file and exit
+	# $USENAME is in the pending or zero lists
+then	# create null directory and repos file, and exit
 	if grep -iw "$USENAME" "$RDR"/var/db/ONAMES
 	then
 		JDR="$RDR/sources/github/orgs/$USER"
 	else
 		JDR="$RDR/sources/github/users/$USER"
 	fi
-	mkdir -p "$JDR"
-	touch "$JDR"/repos
-	printf "\\e[7;38;5;208mUsername %s is found in %s: See preceeding output.  Not processing username %s!  Remove the username from the corresponding file(s) and the user's build directory in %s to proccess %s.  File %s has more information:\\n\\n\\e[0m" "$USENAME" "~/${RDR##*/}/var/db/[PZ]NAMES" "$USENAME" "~/${RDR##*/}/sources/github/{orgs,users}" "$USENAME" "~/${RDR##*/}/var/db/README.md" 
+	mkdir -p "$JDR" # create null directory
+	touch "$JDR"/repos # create null repos file 
+	printf "\\e[7;38;5;208mUsername %s is found in %s: See preceeding output.  Not processing username %s!  Remove the username from the corresponding file(s) and the user's build directory in %s to process %s.  Then run \` %s \` again to attempt to build %s's APK projects, if any.  File %s has more information:\\n\\n\\e[0m" "$USENAME" "~/${RDR##*/}/var/db/[PZ]NAMES" "$USENAME" "~/${RDR##*/}/sources/github/{orgs,users}" "$USENAME" "${0##*/} $USENAME" "$USENAME" "~/${RDR##*/}/var/db/README.md" 
 	cat "$RDR/var/db/README.md" | grep -v \<\!
-	printf "\\e[7;38;5;208m\\nUsername %s is found in %s: Not processing username %s!  Remove the username from the corresponding file(s) and the user's build directory in %s to proccess %s.  Then run %s again to build %s.  Scroll up to read the %s file.\\e[0m\\n" "$USENAME" "~/${RDR##*/}/var/db/[PZ]NAMES" "$USENAME" "~/${RDR##*/}/sources/github/{orgs,users}" "$USENAME" "${0##*/}" "$USENAME" "~/${RDR##*/}/var/db/README.md" 
-	exit 4
-else	# check whether login is a user or an organization.
+	printf "\\e[7;38;5;208m\\nUsername %s is found in %s: Not processing username %s!  Remove the username from the corresponding file(s) and the user's build directory in %s to process %s.  Then run \` %s \` again to attempt to build %s's APK projects, if any.  Scroll up to read the %s file.\\e[0m\\n" "$USENAME" "~/${RDR##*/}/var/db/[PZ]NAMES" "$USENAME" "~/${RDR##*/}/sources/github/{orgs,users}" "$USENAME" "${0##*/} $USENAME" "$USENAME" "~/${RDR##*/}/var/db/README.md" 
+	exit 0 # and exit
+else	# check whether login is a user or an organization
 	_CUTE_
 fi
-export JDR="$RDR/sources/github/$ISOTUR/$USER"
-export JID="git.$ISOTUR.$USER"
-if [[ ! -d "$JDR" ]] 
-then
-	mkdir -p "$JDR"
-fi
-if [[ ! -d "$JDR/.conf" ]] 
-then
-	mkdir -p "$JDR/.conf"
-	printf "%s\\n\\n" "This directory contains results from query for \` AndroidManifest.xml \` files in GitHub $USENAME repositores.  " > "$JDR/.conf/README.md" 
-fi
-cd "$JDR"
-printf "%s" "${TYPE[@]}" > profile
-if [[ ! -f "repos" ]] 
-then
-	printf "%s\\n" "Downloading GitHub $USENAME repositories information:  "
-	if [[ "$OAUT" != "" ]] # see $RDR/.conf/GAUTH file for information 
-	then
-		curl -u "$OAUT" "https://api.github.com/$ISUSER/$USER/repos" > repos
-	else
-		curl "https://api.github.com/$ISUSER/$USER/repos" > repos 
-	fi
-fi
 _PRINTJS_
-JARR=($(grep -v JavaScript repos | grep -B 5 Java | grep svn_url | awk -v x=2 '{print $x}' | sed 's/\,//g' | sed 's/\"//g')) # creates array of Java language repositories	
+JARR=($(grep -v JavaScript "$JDR/repos" | grep -B 5 Java | grep svn_url | awk -v x=2 '{print $x}' | sed 's/\,//g' | sed 's/\"//g')) # creates array of Java language repositories	
 _PRINTJD_
 if [[ "${JARR[@]}" == *ERROR* ]]
 then
-	_SIGNAL_ "404" "search for Java language repository"
+	_SIGNAL_ "404" "search for Java language repositories"
 	_NAMESMAINBLOCK_ CNAMES ZNAMES
 	exit 0
 fi
-F1AR=($(find . -maxdepth 1 -type d)) # creates array of $JDR contents 
+F1AR=($(find "$JDR" -maxdepth 1 -type d)) # creates array of $JDR contents 
+cd "$JDR"
+_PRINTAS_
 for NAME in "${JARR[@]}" # lets you delete partial downloads and repopulates from GitHub.  Directories can be deleted, too.  They are repopulated from the tarballs.  
 do #  This creates a "slate" within each github/$JDR that can be selectively reset when desired.  This can be important on a slow connection.
 	_CKAT_ 
 done
+_PRINTJD_
 _ANDB_ 
 _APKBC_
 . "$RDR"/scripts/bash/shlibs/buildAPKs/bnchn.bash bch.gt 
diff --git a/scripts/bash/build/build.github.topics.bash b/scripts/bash/build/build.github.topics.bash
index 008f30c61..a4e412e8b 100755
--- a/scripts/bash/build/build.github.topics.bash
+++ b/scripts/bash/build/build.github.topics.bash
@@ -4,88 +4,46 @@
 #####################################################################
 set -Eeuo pipefail
 shopt -s nullglob globstar
-
-_SGTRPERROR_() { # run on script error
-	local RV="$?"
-	printf "\\e[?25h\\e[1;7;38;5;0mbuildAPKs %s ERROR:  Signal %s received!\\e[0m\\n" "${0##*/}" "$RV"
-	exit 201
-}
-
-_SGTRPEXIT_() { # run on exit
-	printf "\\e[?25h\\e[0m"
-	set +Eeuo pipefail 
-	exit 0
-}
-
-_SGTRPSIGNAL_() { # run on signal
-	local RV="$?"
-	printf "\\e[?25h\\e[1;7;38;5;0mbuildAPKs %s WARNING:  Signal %s received!\\e[0m\\n" "${0##*/}" "$RV"
- 	exit 211 
-}
-
-_SGTRPQUIT_() { # run on quit
-	local RV="$?"
-	printf "\\e[?25h\\e[1;7;38;5;0mbuildAPKs %s WARNING:  Quit signal %s received!\\e[0m\\n" "${0##*/}" "$RV"
- 	exit 221 
-}
-
-trap '_SGTRPERROR_ $LINENO $BASH_COMMAND $?' ERR 
-trap _SGTRPEXIT_ EXIT
-trap _SGTRPSIGNAL_ HUP INT TERM 
-trap _SGTRPQUIT_ QUIT 
-
 export RDR="$HOME/buildAPKs"
+. "$RDR"/scripts/bash/init/ushlibs.bash
+. "$RDR"/scripts/bash/shlibs/trap.bash 77 78 79 "${0##*/}"
 if [[ -z "${1:-}" ]] 
 then
 	printf "\\e[1;7;38;5;203m%s\\e[1;7;38;5;201m%s\\e[1;7;38;5;203m%s\\e[1;7;38;5;201m%s\\e[1;7;38;5;203m%s\\e[1;7;38;5;201m%s\\e[1;7;38;5;203m%s\\n\\e[0m\\n" "GitHub topic name must be provided;  See " "~/${RDR##*/}/var/conf/TNAMES" " for topic names that build APKs on device with BuildAPKs!  To build all the topic names contained in this file run " "for NAME in \$(cat ~/${RDR##*/}/var/conf/TNAMES) ; do ~/${RDR##*/}/scripts/bash/build/${0##*/} \$NAME ; done" ".  File " "~/${RDR##*/}/var/conf/GAUTH" " has important information should you choose to run this command regarding bandwidth supplied by GitHub. "
-	exit 227
+	exit 4
 fi
 if [[ -z "${NUM:-}" ]] 
 then
 	export NUM="$(date +%s)"
 fi
-. "$RDR"/scripts/bash/init/ushlibs.bash
-. "$RDR"/scripts/bash/shlibs/lock.bash wake.start
 . "$RDR"/scripts/bash/shlibs/buildAPKs/bnchn.bash bch.st 
-export NUM="$(date +%s)"
 export TOPI="${1%/}"
 export TOPIC="${TOPI##*/}"
 export TOPNAME="${TOPIC,,}"
 export JDR="$RDR/sources/github/topics/$TOPIC"
 export JID="git.$TOPIC"
-export OAUT="$(cat "$RDR/var/conf/GAUTH" | awk 'NR==1')"
+export OAUT="$(cat "$RDR/.conf/GAUTH" | awk 'NR==1')"
+export RDR="$HOME/buildAPKs"
 export STRING="ERROR FOUND; build.github.topics.bash $1:  CONTINUING... "
 printf "\\n\\e[1;38;5;116m%s\\n\\e[0m" "${0##*/}: Beginning BuildAPKs with build.github.topics.bash $1:"
 if [[ ! -d "$JDR" ]] 
 then
 	mkdir -p "$JDR"
 fi
-cd "$JDR"
-if [[ ! -d "$JDR/.config" ]] 
-then
-	mkdir -p "$JDR/.config"
-	printf "%s\\n\\n" "This directory contains results from query for \`AndroidManifest.xml\` files in GitHub $TOPNAME repositores.  " > "$JDR/.config/README.md" 
-fi
-if [[ ! -f "repos" ]] 
+if [[ ! -f "$JDR"/topic ]] 
 then
-	printf "%s\\n" "Downloading GitHub $TOPNAME repositories information:  "
+	printf "%s\\n" "Downloading GitHub $TOPNAME topic repositories information:"
 	if [[ "$OAUT" != "" ]] # see $RDR/var/conf/GAUTH file for information 
 	then
-		curl -u "$OAUT" -H "Accept: application/vnd.github.mercy-preview+json" "https://api.github.com/search/repositories?q=topic:$TOPIC+language:Java" -o repos
+		curl -u "$OAUT" -H "Accept: application/vnd.github.mercy-preview+json" "https://api.github.com/search/repositories?q=topic:$TOPIC+language:Java" -o "$JDR"/topic
 	else
-		curl -H "Accept: application/vnd.github.mercy-preview+json" "https://api.github.com/search/repositories?q=topic:$TOPIC+language:Java" -o repos
+		curl -H "Accept: application/vnd.github.mercy-preview+json" "https://api.github.com/search/repositories?q=topic:$TOPIC+language:Java" -o "$JDR"/topic
 	fi
 fi
-TARR=($(grep -v JavaScript repos | grep -B 5 Java | grep svn_url | awk -v x=2 '{print $x}' | sed 's/\,//g' | sed 's/\"//g' | sed 's/https\:\/\/github.com\///g' | cut -d\/ -f1)) # creates array of Java language repositories
+TARR=($(grep -v JavaScript "$JDR"/topic | grep -B 5 Java | grep svn_url | awk -v x=2 '{print $x}' | sed 's/\,//g' | sed 's/\"//g' | sed 's/https\:\/\/github.com\///g' | cut -d\/ -f1)) # creates array of Java language repositories for topic
 for NAME in "${TARR[@]}" 
 do 
-	read TYPE < <(curl "https://api.github.com/users/$NAME/repos" -s 2>&1 | head -n 25 | tail -n 1 | grep -o Organization) # https://stackoverflow.com/questions/2559076/how-do-i-redirect-output-to-a-variable-in-shell/
-	if [[ "$TYPE" == Organization ]]
-	then
-		"$RDR"/scripts/bash/components/build.github.orgs.bash "$NAME"
-	else
-		"$RDR"/scripts/bash/components/build.github.users.bash "$NAME"
-	fi
+	"$RDR"/scripts/bash/build/build.github.bash "$NAME"
 done
 . "$RDR"/scripts/bash/shlibs/lock.bash wake.stop
 . "$RDR"/scripts/bash/shlibs/buildAPKs/bnchn.bash bch.gt 
diff --git a/scripts/bash/ushlibs.bash b/scripts/bash/ushlibs.bash
deleted file mode 100644
index 10fbaa6e2..000000000
--- a/scripts/bash/ushlibs.bash
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/env bash
-# Copyright 2017-2019 (c) all rights reserved 
-# by S D Rausty https://sdrausty.github.io
-#####################################################################
-set -Eeuo pipefail
-shopt -s nullglob globstar
-
-_SRSTRPERROR_() { # run on script error
-	local RV="$?"
-	echo "$RV" init.bash
-	printf "\\e[?25h\\n\\e[1;48;5;138mBuildAPKs %s ERROR:  Generated script error %s near or at line number %s by \`%s\`!\\e[0m\\n" "${PWD##*/}" "${1:-UNDEF}" "${2:-LINENO}" "${3:-BASH_COMMAND}"
-	exit 147
-}
-
-_SRSTRPEXIT_() { # run on exit
-	printf "\\e[?25h\\e[0m"
-	set +Eeuo pipefail 
-	exit
-}
-
-_SRSTRPSIGNAL_() { # run on signal
-	local RV="$?"
-	printf "\\e[?25h\\e[1;7;38;5;0mBuildAPKs %s WARNING:  Signal %s received!\\e[0m\\n" "init.bash" "$RV"
- 	exit 148 
-}
-
-_SRSTRPQUIT_() { # run on quit
-	local RV="$?"
-	printf "\\e[?25h\\e[1;7;38;5;0mBuildAPKs %s WARNING:  Quit signal %s received!\\e[0m\\n" "init.bash" "$RV"
- 	exit 149 
-}
-
-trap '_SRSTRPERROR_ $? $LINENO $BASH_COMMAND' ERR 
-trap _SRSTRPEXIT_ EXIT
-trap _SRSTRPSIGNAL_ HUP INT TERM 
-trap _SRSTRPQUIT_ QUIT 
-
-_AFSHLIBS_() { # https://stackoverflow.com/questions/53977052/how-to-properly-initialize-a-remote-git-repository 
-	if [[ ! -d "$RDR"/.git ]] 
-	then
-		local USER="BuildAPKs"
-		local HOSTIP="github.com"
-		local PROJECT="buildAPKs"
-		git init ; git remote add origin ssh://${USER}@${HOSTIP}${PROJECT}.git
-	fi
-}
-
-_UFSHLIBS_() { 
-	if grep shlibs .gitmodules 1>/dev/null
-	then
-		printf "\\e[1;7;38;5;96mUpdating ~/%s/scripts/bash/shlibs...\\e[0m\\n" "${RDR##*/}" ; git submodule update --recursive --remote scripts/bash/shlibs || printf "\\nCannot update module ~/%s/scripts/bash/shlibs: Continuing...\\n\\n" "${RDR##*/}"
-	else
-		printf "\\e[1;7;38;5;96mAdding ~/%s/scripts/bash/shlibs...\\e[0m\\n" "${RDR##*/}" ; git submodule add https://github.com/shlibs/shlibs.bash scripts/bash/shlibs || printf "\\nCannot add modules ~/%s/scripts/bash/shlibs: Continuing...\\n\\n" "${RDR##*/}"
-	fi
-}
-
-cd "$RDR"
-_AFSHLIBS_
-if [[ ! -f "$RDR"/scripts/bash/shlibs/.git ]] 
-then
-	git pull || printf "\\nCannot update ~/%s: Continuing...\\n\\n" "${RDR##*/}"
-	_UFSHLIBS_
-fi
-# ushlibs.bash EOF
diff --git a/sha512.sum b/sha512.sum
index edae84432..a37ba738e 100644
--- a/sha512.sum
+++ b/sha512.sum
@@ -1,8 +1,8 @@
 7f4656bffcd3b83aa9b7dff485725d4eccee7f4fc5499157acdb968ae68f0b2d7b41f030fef38207b522d6a404cdd03925da86c0dd28b796301d0e3a31f45d72  ./.conf/GAUTH
-99c4554d84340ab1807b805ee760c5ea848076a7deb266331174e9e30a61f5cb024380a0d584628b7c7f11dcb0eb76a193c6ead3560722380eb0e76239ca0ddb  ./.conf/VERSIONID
+91c1a601fba1e1a9c49336902a1ecc7fca8bf7f2d32a5f8e971f9c8699b99a07c8e97e3a5672c1e3471ae4083e2a1106a6026d67f29c0079327434d47fef5541  ./.conf/VERSIONID
 6f7d3b0b849fbe3d5251c75c11e2fb39eae5059984895dfb64467a50c67bd7f75cf897cdf85a2d7a3471e14bc1d627295cb6b49300a9161c90b93e4d197157ae  ./CHANGE.log
 ae7e3bf1dbc9739b31c7d47d0664361d9df21fe3bd0d06bff52f2ecad228dc45ba25536f9a866df743fbd7074d116fbdfac199c1342ab2a1270a735d7877ef05  ./LICENSE
-0c3ff08af51985e3eb5b30fe924193127a5f945fe65e0d04938f178f77093975695841a17a71387d5cb92e08b8888b6546f432ff038ad3ec0d4af6046913ba19  ./README.md
+2397dd0bd74a24851dbfa2110a2d141ef61ebebd9df8ee13efe90ec26dfb5b3959d49c767e3228d1eeef5e348246ace5a47946e4335fa97db7b63ec32f366516  ./README.md
 e58f9f97da56a01965e3dc58c9277973c915d8eae6726945afe67e89718ce8138cd2bc5c067753f358044f14348aa02d662aa2af4bc2d144bc60ce463ca1771f  ./scripts/bash/build/build.apps.bash
 1b412193ac2f6e5ab1da23033192f28061019f07ad1aa96d46ab41e65f35076a59057c5eaeed44357bd633267bcf6276bff817e46f97922e0a23495ddf899e31  ./scripts/bash/build/build.buildAPKs.bash
 3c7fbc0949545602e2263d65d2fe9da52a929256845c4ef055e5b83867663abc9010660b619072a904a436074c444720baf923aefd497f5272816528a1a3e36a  ./scripts/bash/build/build.clocks.bash
@@ -28,7 +28,6 @@ f5adf5b8df9f60167b95472d5e90853ddee32447ec80d4763873f3d7b96c4d090e08c7dd29fee163
 f45b76872607a2fee5aa6223faea710b763a6ae41b9bbee855d000ffa443b8d0c070815e9b85883e06c90b055f42c2aa8f61dee9b5d56fec3ea0241941e5564b  ./scripts/bash/init/rshlibs.bash
 8551813dac85a49494aa11601899bbd2f4e6faec98e02db3568caf72cce511e55c4f5af94596fca84b59643e0a5217c2cae11f31d2924f300bfd94e003dd8dcf  ./scripts/bash/init/setup.buildAPKs.bash
 e106a2944d32738937bc36632d1a18f2209058bb1524bccd1e5d610c55ba1ae8ce64861df32ba34bb72120162c36e86b7cb26bd07b66ea2bcfe0c4670fe922d2  ./scripts/bash/init/ushlibs.bash
-625cf7dd17d234115d6c1b214a62fad24829a6f596be371acec8428b6f764f5b18af8f5e382cd486f434a238863c86925904a7229c8bf8ed2ce8720c6116441d  ./scripts/bash/ushlibs.bash
 5c16b78a9c71bf3b548822cef12bd7bb076d3b4eb624b92058dc2f51fdeb35a6e7b5f6e27bba17b26aa3f8a9cc4ff21c744cb5a300519c008971a7971405dc90  ./scripts/maintenance/do.sums.bash
 06a602f5c87d876ce01787b91c5745a4340578a715371992cfadafa6bb62639bb06bec613fa2867d35e2e0e9f2f7c628d7c22ba36cb36f458c9738539b516829  ./scripts/maintenance/vgen.sh
 fa6ab37f93d608149ef2391190d4b054ef5e9c99d8e4b063164c6c1132488756c21e91116c49d4d467772b43f3d9d68e5f28f6f67779db2c0569e4cb38a0fe6b  ./scripts/sh/build/build.dir.sh