modified: CHANGE.log

modified: LICENSE modified: README.md renamed: archlinuxconfig.sh -> archlinuxconfig.bash renamed: espritfunctions.sh -> espritfunctions.bash renamed: getimagefunctions.sh -> getimagefunctions.bash modified: gsa.bash modified: init.sh renamed: knownconfigurations.sh -> knownconfigurations.bash renamed: maintenanceroutines.sh -> maintenanceroutines.bash renamed: necessaryfunctions.sh -> necessaryfunctions.bash renamed: printoutstatements.sh -> printoutstatements.bash modified: pullTermuxArchSubmodules.sh modified: robots.txt new file: setupTermuxArch.bash modified: setupTermuxArch.sh modified: setupTermuxArch.sha512 modified: setupTermuxArch.tar.gz modified: sitemap.txt new file: tgen.bash
SDRausty · Oct 4, 2019 · 37315c3 · 37315c3
1 parent e792d9e
commit 37315c3
Show file tree

Hide file tree

Showing 20 changed files with 1,087 additions and 230 deletions.
diff --git a/CHANGE.log b/CHANGE.log
@@ -5,51 +5,43 @@ Sat Dec  9 2017
 Wed Jan 10 2018
 4.9M    TermuxArch/
 4.5M    TermuxArch/.git
-Computed on 20180117 branch master:
+Computed on 20180117 branch master.
 1.2M	.git
 1.9M	.
-Computed on 20180129 branch master:
+Computed on 20180129 branch master.
 8.8M	.git
 11M	.
-Computed on 20180204 branch master:
+Computed on 20180204 branch master.
 14M	.git
 16M	.
-Computed on 20180719 branch master:
+Computed on 20180719 branch master.
 32.8M	.git
 38.5M	.
-Computed on 20180919 branch master:
+Computed on 20180919 branch master.
 90.7M	.git
 96.2M	.
-Computed on 20180919 branch master:
+Computed on 20180919 branch master.
 3.2M	.git
 8.7M	.
-Computed on 20180920 branch master:
+Computed on 20180920 branch master.
 556.0K	.git
 808.0K	.
-Computed on 20180920 branch master:
+Computed on 20180920 branch master.
 4.0M	.git
 11.3M	.
-Computed on 20190603 branch master:
+Computed on 20190603 branch master.
 Size in KB
 3776	.git
 4044	.
-Computed on 20190603 branch master:
+Computed on 20190603 branch master.
 Size in KB
 3780	.git
 4048	.
 RESET: size
 Size in KB
 388	.git
 656	.
-Computed on 20190611 branch master:
+Computed on 20190611 branch master.
 Size in KB
 692	.git
 1044	.
-Computed on 20190724 branch master:
-Size in KB
-1876	.git
-2208	.
-RESET: size
-Size in KB
-592	.git
-924	.
diff --git a/LICENSE b/LICENSE
@@ -1,28 +1,3 @@
-Copyright 2017-2018 by SDRausty. All rights reserved.
-
-Cumulative License:
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Also:
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/README.md b/README.md
@@ -1,22 +1,36 @@
-# [TermuxArch](https://github.com/sdrausty/TermuxArch)
-[![Join the chat at https://gitter.im/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux)  Termux developer questions welcome.   
+<link rel="prerender" href="https://termuxarch.github.io/TermuxArch/">
 
-##### -rwxrwx--- [setupTermuxArch.sh](https://sdrausty.github.io/TermuxArch/setupTermuxArch.sh) 
-##### -r--r--r-- [setupTermuxArch.sh](https://raw.githubusercontent.com/sdrausty/TermuxArch/master/setupTermuxArch.sh)
+## TermuxArch
 
-This Termux bash setup shell script shall attempt to set Arch Linux up in your Termux environment.  See [install](https://sdrausty.github.io/docsTermuxArch/install) for options how to run [`setupTermuxArch.sh`](https://raw.githubusercontent.com/sdrausty/TermuxArch/master/setupTermuxArch.sh) on device.  Use `bash setupTermuxArch.sh` to install [Arch](https://wiki.archlinux.org/) Linux in a Termux [PRoot](https://sdrausty.github.io/docsTermuxArch/PRoot) container on your Android smartphone and tablet, and Chromebook too.  When successfully completed, you will be experiencing the pleasure of the Linux command prompt in Arch Linux in Termux PRoot on Android, Chromebook and Fire OS on smartphone, tablet and wearable.
+##### -r--r--r-- [setupTermuxArch.bash](https://raw.githubusercontent.com/TermuxArch/TermuxArch/master/setupTermuxArch.bash)
+##### -rwxrwx--- [setupTermuxArch.bash](https://TermuxArch.github.io/TermuxArch/setupTermuxArch.bash) 
+
+This Termux bash setup shell script will attempt to set Arch Linux up in your Termux environment.  See [install](https://TermuxArch.github.io/docsTermuxArch/install) for options how to run [`setupTermuxArch.bash`](https://raw.githubusercontent.com/TermuxArch/TermuxArch/master/setupTermuxArch.bash) on device.  Use `bash setupTermuxArch.bash` to install [Arch](https://wiki.archlinux.org/) Linux in a Termux [PRoot](https://TermuxArch.github.io/docsTermuxArch/PRoot) container on your Android smartphone and tablet, and Chromebook too.  When successfully completed, you will be experiencing the pleasure of the Linux command prompt in Arch Linux in Termux PRoot on Android, Chromebook and Fire OS on smartphone, tablet and wearable.
 
 #### Screenshot from an Android smartphone 2018
-[![screenshot_20180413-172406](https://user-images.githubusercontent.com/27742457/38758637-ec0ff0dc-3f3f-11e8-802c-82bc511cde88.png)](https://sdrausty.github.io/docsTermuxArch/install)
+[![screenshot_20180413-172406](https://user-images.githubusercontent.com/27742457/38758637-ec0ff0dc-3f3f-11e8-802c-82bc511cde88.png)](https://TermuxArch.github.io/docsTermuxArch/install)
 
-* Comments are welcome at [https://github.com/sdrausty/TermuxArch/issues](https://github.com/sdrausty/TermuxArch/issues?q=is%3Aissue+is%3Aclosed) ✍ 
+* Comments are welcome at [https://github.com/TermuxArch/TermuxArch/issues](https://github.com/TermuxArch/TermuxArch/issues?q=is%3Aissue+is%3Aclosed) ✍ 
 
-* Pull requests are welcome [https://github.com/sdrausty/TermuxArch/pulls](https://github.com/sdrausty/TermuxArch/pulls?q=is%3Apr+is%3Aclosed) ✍ 
+* Pull requests are welcome [https://github.com/TermuxArch/TermuxArch/pulls](https://github.com/TermuxArch/TermuxArch/pulls?q=is%3Apr+is%3Aclosed) ✍ 
 
 Thank you for making this project work better and please contribute 🔆  [Contributors](CONTRIBUTORS.md) and [Notice to Contributors](NOTICE.md) have more information about this project.
 
 ![Screenshot of Arch On Termux](https://raw.githubusercontent.com/TermuxArch/imgsTermuxArch/master/IMG_20171019_190414.jpg)
 
 [PRoot](docs/PRoot) has more information about Linux on device with Termux.
 
-<!-- #EOM -->
+Share https://wiki.termux.com/wiki/Development everwhere🌎🌍🌏🌐!
+
+Install Arch Linux into a Termux PRoot container with [`bash setupTermuxArch.bash`](setupTermuxArch.bash).  After succesfull installation start the container with `startarch`.
+
+See https://TermuxArch.github.io/TermuxArch/docs/install for options how to run [`setupTermuxArch.bash`](https://TermuxArch.github.io/TermuxArch/setupTermuxArch.bash) on device.  
+
+See https://TermuxArch.github.io/docsTermuxArch/startingArch for options how to start the Arch Linux container `startarch` on device.
+
+This repository uses submodules.  To get all the pieces of this repository run after cloning in the root directory of this repository: 
+
+```
+git submodule update --init --recursive
+``` 
+
diff --git a/archlinuxconfig.sh → archlinuxconfig.bash b/archlinuxconfig.sh → archlinuxconfig.bash
@@ -141,7 +141,7 @@ addch() {
 	}
 	
 	_PRINTTAIL_() {
-		printf "\\\\a\\\\n\\\\e[0m%s \\\\e[0;32m%s %s %s\\\\a\\\\e[1;34m: \\\\a\\\\e[1;32m%s\\\\e[0m 🏁  \\\\n\\\\n\\\\a\\\\e[0m" "TermuxArch" "\$(basename "\$0")" "\$ARGS"  "\$VERSIONID" "DONE"
+		printf "\\\\n\\\\e[0m%s \\\\e[0;32m%s %s %s\\\\e[1;34m: \\\\e[1;32m%s\\\\e[0m 🏁  \\\\n\\\\n\\\\e[0m" "TermuxArch" "\$(basename "\$0")" "\$ARGS"  "\$VERSIONID" "DONE"
 		printf '\033]2;  🔑🗝 TermuxArch '"\$(basename "\$0")"':DONE 📱 \007'
 	}
 
@@ -273,7 +273,7 @@ _ADDfbindprocstat8_() {
 }
 
 addfbindexample() {
-	_CFLHDRS_ var/binds/fbindexample.prs "# To regenerate the start script use \`setupTermuxArch.sh re[fresh]\`.  Add as many proot statements as you want; The init script will parse this file at refresh.  Examples are included for convenience.  Usage: PROOTSTMNT+=\"-b host_path:guest_path \" The space before the last double quote is necessary." 
+	_CFLHDRS_ var/binds/fbindexample.prs "# To regenerate the start script use \`setupTermuxArch.bash re[fresh]\`.  Add as many proot statements as you want; The init script will parse this file at refresh.  Examples are included for convenience.  Usage: PROOTSTMNT+=\"-b host_path:guest_path \" The space before the last double quote is necessary." 
 	cat >> var/binds/fbindexample.prs <<- EOM
 	# PROOTSTMNT+="-b $INSTALLDIR/var/binds/fbindprocstat:/proc/stat " 
 	# if [[ ! -r /dev/shm ]] ; then 
@@ -388,7 +388,7 @@ addkeys() {
 	}
 
 	_PRINTTAIL_() {
-		printf "\\\\a\\\\n\\\\e[0;32m%s %s %s\\\\a\\\\e[1;34m: \\\\a\\\\e[1;32m%s\\\\e[0m 🏁  \\\\n\\\\n\\\\a\\\\e[0m" "TermuxArch \$(basename "\$0")" "\$ARGS" "\$VERSIONID" "DONE"
+		printf "\\\\n\\\\e[0;32m%s %s %s\\\\e[1;34m: \\\\e[1;32m%s\\\\e[0m 🏁  \\\\n\\\\n\\\\e[0m" "TermuxArch \$(basename "\$0")" "\$ARGS" "\$VERSIONID" "DONE"
 		printf '\033]2;  🔑🗝 TermuxArch '"\$(basename "\$0") \$ARGS"': DONE 📱 \007'
 	}
 
@@ -452,7 +452,7 @@ addpc() {
 	}
 	
 	_PRINTTAIL_() {
-		printf "\\\\a\\\\n\\\\e[0;32m%s %s %s\\\\a\\\\e[1;34m: \\\\a\\\\e[1;32m%s\\\\e[0m 🏁  \\\\n\\\\n\\\\a\\\\e[0m" "TermuxArch \$(basename "\$0")" "\$ARGS" "\$VERSIONID" "DONE"
+		printf "\\\\n\\\\e[0;32m%s %s %s\\\\e[1;34m: \\\\e[1;32m%s\\\\e[0m 🏁  \\\\n\\\\n\\\\e[0m" "TermuxArch \$(basename "\$0")" "\$ARGS" "\$VERSIONID" "DONE"
 		printf '\033]2;  🔑🗝 TermuxArch '"\$(basename "\$0") \$ARGS"' 📱 \007'
 	}
 
@@ -488,7 +488,7 @@ addpci() {
 	}
 	
 	_PRINTTAIL_() { 
-		printf "\\\\a\\\\n\\\\e[0;32m%s %s %s\\\\a\\\\e[1;34m: \\\\a\\\\e[1;32m%s\\\\e[0m 🏁  \\\\n\\\\n\\\\a\\\\e[0m" "TermuxArch \$(basename "\$0")" "\$ARGS" "\$VERSIONID" "DONE"
+		printf "\\\\n\\\\e[0;32m%s %s %s\\\\e[1;34m: \\\\e[1;32m%s\\\\e[0m 🏁  \\\\n\\\\n\\\\e[0m" "TermuxArch \$(basename "\$0")" "\$ARGS" "\$VERSIONID" "DONE"
 		printf '\033]2;  🔑🗝 TermuxArch '"\$(basename "\$0") \$ARGS"' 📱 \007'
 	}
 
@@ -507,6 +507,7 @@ addpci() {
 	else
 	pacman --noconfirm --color=always -Syu "\$@" 
 	fi
+	# pci EOF
 	EOM
 	chmod 700 root/bin/pci 
 }
@@ -588,7 +589,7 @@ addtour() {
 addtrim() {
 	_CFLHDR_ root/bin/trim
 	cat >> root/bin/trim <<- EOM
-	printf "\\\\n\\\\e[1;32m==> \\\\e[1;0mRunning \$0 … \\\\e[0m\\\\n\\\\n" 
+	printf "\\\\n\\\\e[1;32m==> \\\\e[1;0mRunning \$0 $@\\\\e[0m\\\\n\\\\n" 
 	echo [1/5] rm -rf /boot/
 	rm -rf /boot/
 	echo [2/5] rm -rf /usr/lib/firmware

diff --git a/espritfunctions.sh → espritfunctions.bash b/espritfunctions.sh → espritfunctions.bash
@@ -25,7 +25,7 @@ addlangq() {
 	done
 }
 
-bloom() { # Bloom = `setupTermuxArch.sh manual verbose` 
+bloom() { # Bloom = `setupTermuxArch.bash manual verbose` 
 	if [[ -d "$HOME"/TermuxArchBloom ]];then 
 		rmbloomq 
 	fi
@@ -34,10 +34,10 @@ bloom() { # Bloom = `setupTermuxArch.sh manual verbose`
 	fi
 	cp *sh "$HOME"/TermuxArchBloom
 	cd "$HOME"/TermuxArchBloom
-	printf "\\e[1;34mTermuxArch Bloom option via \\e[1;32msetupTermuxArch.sh bloom\\e[0m 📲\\n\\n\\e[0m"'\033]2; TermuxArch Bloom option via `setupTermuxArch.sh bloom` 📲 \007'
+	printf "\\e[1;34mTermuxArch Bloom option via \\e[1;32msetupTermuxArch.bash bloom\\e[0m 📲\\n\\n\\e[0m"'\033]2; TermuxArch Bloom option via `setupTermuxArch.bash bloom` 📲 \007'
 	printf "\\n"
 	ls -agl
-	printf "\\n\\e[1;34mUse \\e[1;32mcd ~/TermuxArchBloom\\e[1;34m to continue.  Edit any of these files; Then use \\e[1;32mbash $0 [options] \\e[1;34mto run the files in \\e[1;32m~/TermuxArchBloom\\e[1;34m.\\n\\e[0m"'\033]2;  TermuxArch Bloom option via `setupTermuxArch.sh bloom` 📲 \007'
+	printf "\\n\\e[1;34mUse \\e[1;32mcd ~/TermuxArchBloom\\e[1;34m to continue.  Edit any of these files; Then use \\e[1;32mbash $0 [options] \\e[1;34mto run the files in \\e[1;32m~/TermuxArchBloom\\e[1;34m.\\n\\e[0m"'\033]2;  TermuxArch Bloom option via `setupTermuxArch.bash bloom` 📲 \007'
 	exit
 }
 
@@ -59,7 +59,7 @@ _COPYSTARTBIN2PATHQ_() {
 }
 
 _EDITFILES_() {
-	if [[ "${ceds[$i]}" = "applets/vi" ]];then
+	if [[ "${ceds[$i]}" = "vi" ]];then
 		sed -i -e 1,4d "$INSTALLDIR"/etc/pacman.d/mirrorlist
 		sed -i '1i# # # # # # # # # # # # # # # # # # # # # # # # # # #\n# TermuxArch vi instructions:	CTR+r is redo.\n# Use the hjkl keys to navigate. <h down j up k l>\n# Numbers are multipliers.  The u is undelete/undo.\n# 17j then i opens edit mode for the Geo-IP CMIRROR.\n# Enter the # hash/num/pounds symbol to comment it out: \n# Server = http://CMIRROR.archlinuxarm.org/$arch/$repo.\n# Long tap KEYBOARD in the side pane to see ESC, CTR...\n# Tap ESC to return to command mode in vi.\n# CTRL+d and CTRL+b to find your local CMIRROR.\n# / for search, N and n for next match.\n# Tap x to delete # to uncomment your local CMIRROR.\n# Choose only one CMIRROR.  Use :x to save your work.\n# Comment out the Geo-IP CMIRROR	end G	top gg\n# # # # # # # # # # # # # # # # # # # # # # # # # # #' "$INSTALLDIR"/etc/pacman.d/mirrorlist
 		sed -i '1i# # # # # # # # # # # # # # # # # # # # # # # # # # #\n# TermuxArch vi instructions:	CTR+r is redo.\n# Use the hjkl keys to navigate. <h down j up k l>\n# Numbers are multipliers.  The u is undelete/undo.\n# Tap i for insert, ESC to return to command mode in vi.\n# Long tap KEYBOARD in the side pane to see ESC, CTR...\n# Tap x to delete # to uncomment your favorite language(s).\n# Enter the # hash/num/pounds symbol to comment out locales.\n# CTRL+d and CTRL+b for PGUP & PGDN.\n# top gg	bottom G\n# / for search, N and n for next match.\n# Choose as many as you like.  Use :x to save your work.\n# # # # # # # # # # # # # # # # # # # # # # # # # # #\n#' "$INSTALLDIR"/etc/locale.gen
@@ -77,7 +77,7 @@ _EDITFILES_() {
 }
 
 _EDITORS_() {
-	aeds=("zile" "nano" "nvim" "vi" "emacs" "joe" "jupp" "micro" "ne" "applets/vi")
+	aeds=("emacs" "joe" "jupp" "nano" "ne" "nvim" "micro"  "vi""vim" "zile")
 	for i in "${!aeds[@]}"; do
 		if [[ -e "$PREFIX/bin/${aeds[$i]}" ]];then
 			ceds+=("${aeds[$i]}")
@@ -97,7 +97,7 @@ _EDITORS_() {
 edq() {
 	printf "\\e[0;32m"
 	for i in "${!ceds[@]}"; do
-		if [[ "${ceds[$i]}" = "applets/vi" ]];then
+		if [[ "${ceds[$i]}" = "vi" ]];then
 			edq2
 			ind=1
 			break
@@ -118,7 +118,7 @@ edqaquestion() {
 	while true; do
 		printf "\\n"
 		if [[ "$OPT" = bloom ]] || [[ "$OPT" = manual ]];then
-			printf "The following editor(s) $cedst\\b\\b are present.  Would you like to use \`\\e[1;32m${ceds[$i]}\\e[0;32m\` to edit \`\\e[1;32msetupTermuxArchConfigs.sh\\e[0;32m\`?  "
+			printf "The following editor(s) $cedst\\b\\b are present.  Would you like to use \`\\e[1;32m${ceds[$i]}\\e[0;32m\` to edit \`\\e[1;32msetupTermuxArchConfigs.bash\\e[0;32m\`?  "
 			read -n 1 -p "Answer yes or no [Y|n]. "  yn
 		else 
 			printf "Change the worldwide CMIRROR to a CMIRROR that is geographically nearby.  Choose only ONE active CMIRROR in the CMIRRORs file that you are about to edit.  The following editor(s) $cedst\\b\\b are present.  Would you like to use \`\\e[1;32m${ceds[$i]}\\e[0;32m\` to edit the Arch Linux configuration files?  "
@@ -140,7 +140,7 @@ edqaquestion() {
 edq2() {
 	while true; do
 		if [[ "$OPT" = bloom ]] || [[ "$OPT" = manual ]];then
-			printf "\\n\\e[1;34m  Would you like to use \\e[1;32mnano\\e[1;34m or \\e[1;32mvi\\e[1;34m to edit \\e[1;32msetupTermuxArchConfigs.sh\\e[1;34m?  "
+			printf "\\n\\e[1;34m  Would you like to use \\e[1;32mnano\\e[1;34m or \\e[1;32mvi\\e[1;34m to edit \\e[1;32msetupTermuxArchConfigs.bash\\e[1;34m?  "
 			read -n 1 -p "Answer nano or vi [n|V]? "  nv
 		else 
 			printf "\\e[1;34m  Change the worldwide CMIRROR to a CMIRROR that is geographically nearby.  Choose only ONE active CMIRROR in the CMIRRORs file that you are about to edit.  Would you like to use \\e[1;32mnano\\e[1;34m or \\e[1;32mvi\\e[1;34m to edit the Arch Linux configuration files?  "
@@ -152,7 +152,7 @@ edq2() {
 			ind=1
 			break
 		elif [[ "$nv" = [Vv]* ]] || [[ "$nv" = "" ]];then
-			ed="$PREFIX"/bin/applets/vi
+			ed=vi
 			ind=1
 			break
 		else
@@ -175,7 +175,7 @@ nanoif() {
 
 rmbloomq() {
 	if [[ -d "$HOME"/TermuxArchBloom ]];then
-		printf "\\n\\n\\e[0;33mTermuxArch: \\e[1;33mDIRECTORY WARNING!  $HOME/TermuxArchBloom/ \\e[0;33mdirectory detected.  \\e[1;30msetupTermuxArch.sh bloom will continue.\\n"
+		printf "\\n\\n\\e[0;33mTermuxArch: \\e[1;33mDIRECTORY WARNING!  $HOME/TermuxArchBloom/ \\e[0;33mdirectory detected.  \\e[1;30msetupTermuxArch.bash bloom will continue.\\n"
 		while true; do
 			printf "\\n\\e[1;30m"
 			read -n 1 -p "Refresh $HOME/TermuxArchBloom? [Y|n] " rbuanswer
@@ -200,13 +200,13 @@ rmbloomq() {
 
 _RUNFINISHSETUPQ_() {
 	while true; do
-		printf "\\n\\e[0;32mWould you like to run \\e[1;32mfinishsetup.sh\\e[0;32m to complete the Arch Linux configuration and update now, or at a later time?  \\e[1;32mNow is recommended.  \\e[0;32m"
+		printf "\\n\\e[0;32mWould you like to run \\e[1;32mfinishsetup.bash\\e[0;32m to complete the Arch Linux configuration and update now, or at a later time?  \\e[1;32mNow is recommended.  \\e[0;32m"
 		read -n 1 -p "Answer yes to complete the Arch Linux configuration and update now; Or answer no for later [Y|n] " nl
 	if [[ "$nl" = [Yy]* ]] || [[ "$nl" = "" ]];then
 		_RUNFINISHSETUP_ 
 		break
 	elif [[ "$nl" = [Nn]* ]];then
-		printf "\\n\\e[0;32mSet the geographically nearby CMIRROR in \\e[1;32m/etc/pacman.d/mirrorlist\\e[0;32m first.  Then use \\e[1;32m$INSTALLDIR/root/bin/setupbin.sh\\e[0;32m in Termux to run \\e[1;32mfinishsetup.sh\\e[0;32m or simply \\e[1;32mfinishsetup.sh\\e[0;32m in Arch Linux Termux PRoot to complete the Arch Linux configuration and update."
+		printf "\\n\\e[0;32mSet the geographically nearby CMIRROR in \\e[1;32m/etc/pacman.d/mirrorlist\\e[0;32m first.  Then use \\e[1;32m$INSTALLDIR/root/bin/setupbin.bash\\e[0;32m in Termux to run \\e[1;32mfinishsetup.bash\\e[0;32m or simply \\e[1;32mfinishsetup.bash\\e[0;32m in Arch Linux Termux PRoot to complete the Arch Linux configuration and update."
 		break
 	else
 		printf "\\nYou answered \\e[1;36m$nl\\e[1;32m.\\n"

diff --git a/getimagefunctions.sh → getimagefunctions.bash b/getimagefunctions.sh → getimagefunctions.bash
diff --git a/gsa.bash b/gsa.bash
@@ -1,13 +1,13 @@
 #!/bin/env bash
 # Copyright 2019 (c) all rights reserved 
-# by S D Rausty https://sdrausty.github.io
+# by S D Rausty https://termuxarch.github.io/TermuxArch/
 #####################################################################
 set -Eeuo pipefail
 shopt -s nullglob globstar
 
 _SGSATRPERROR_() { # Run on script error.
 	local RV="$?"
-	echo "$RV"
+	printf "\\n%s\\n" "$RV"
 	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" "gsa.bash" "${3:-VALUE}" "${1:-LINENO}" "${2:-BASH_COMMAND}"
 	exit 179
 }
@@ -36,13 +36,16 @@ trap _SGSATRPSIGNAL_ HUP INT TERM
 trap _SGSATRPQUIT_ QUIT 
 
 _GSA_() {
-	(git submodule add $3 https://github.com/sdrausty/$2 $1) || (echo ; echo "Cannot update $2: continuing...") 
+	(git submodule add $3 https://github.com/termuxarch/$2 $1) || ./pullTermuxArchSubmodules.sh || (printf "\\n\\n%s\\n" "Cannot update $2 : Continuing...") 
 }
 
 _GSA_ docs docsTermuxArch ""
-_GSA_ docs/imgs imgsTermuxArch "-f"
-_GSA_ gens gensTermuxArch ""
+cd docs
+_GSA_ imgs imgsTermuxArch "-f"
+cd ..
+_GSA_ gen genTermuxArch ""
 _GSA_ scripts scriptsTermuxArch ""
-_GSA_ scripts/frags/dfa dfa "-f"
+cd scripts
+_GSA_ frags/dfa dfa "-f"
 
-#EOF
+# gsa.bash EOF
diff --git a/init.sh b/init.sh
@@ -20,4 +20,4 @@ ln -s ../busybox tar
 ln -s ../busybox uname
 bash "$HOME"/setupTermuxArch.sh # h for more information
 
-#init.sh EOF
+# init.sh EOF