commit 741271830 on 20201127

.conf/VERSIONID

@@ -1 +1 @@
-2.0.389
+2.0.390

archlinuxconfig.bash

@@ -774,7 +774,7 @@ if [ "\$UID" = "0" ]
 then
 printf "\\\\e[1;31m%s\\\\e[1;37m%s\\\\e[1;31m%s\\\\e[0m\\\\n" "ERROR:" "  Script '\${0##*/}' should not be used as root:  The command 'addauser' creates user accounts in Arch Linux in Termux PRoot and configures these user accounts for the command 'sudo':  The 'addauser' command is intended to be run by the Arch Linux in Termux PRoot root user:  To use 'addauser' directly from Termux you can run \"$STARTBIN command 'addauser user'\" in Termux to create this account in Arch Linux Termux PRoot:  The command '$STARTBIN help' has more information about using '$STARTBIN':  " "Exiting..."
 else
-[ ! -f /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock ] && patchmakepkg || printf "\\\\e[0;33m%s\\\\e[0m\\\\n" "Lock file /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock found;  Continuing..."
+[ ! -f /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock ] && patchmakepkg || printf "\\\\e[1;33m%s\\\\e[0;33m%s\\\\e[0m\\\\n" "[2/2] " "Lock file /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock found;  Continuing..."
 printf "%s\\\\n" "Preparing to build and install fakeroot-tcp with \${0##*/} $VERSIONID: "
 if ([[ ! "\$(command -v automake)" ]] || [[ ! "\$(command -v git)" ]] || [[ ! "\$(command -v gcc -v)" ]] || [[ ! "\$(command -v libtool)" ]] || [[ ! "\$(command -v po4a)" ]]) 2>/dev/null
 then
@@ -836,7 +836,7 @@ The message above will be displayed for a short time with more information.  The
 Then this process will continue to try to make 'yay' which is much simpler for the user;  There is no tapping yes enter needed to be done whatsoever.
 Script \${0##*/} information presentation done;  SLEEPING SIX SECONDS..."
 sleep 6
-[ ! -f /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock ] && patchmakepkg || printf "\\\\e[0;33m%s\\\\e[0m\\\\n" "Lock file /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock found;  Continuing..."
+[ ! -f /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock ] && patchmakepkg || printf "\\\\e[1;33m%s\\\\e[0;33m%s\\\\e[0m\\\\n" "[1/2] " "Lock file /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock found;  Continuing..."
 if ([[ ! "\$(command -v automake)" ]] || [[ ! "\$(command -v git)" ]] || [[ ! "\$(command -v gcc)" ]] || [[ ! "\$(command -v go)" ]] || [[ ! "\$(command -v po4a)" ]]) 2>/dev/null
 then
 pci automake base base-devel git gcc glibc go libtool po4a || printf "\\n\\e[1;31mERROR: \\e[7;37m%s\\e[0m\\n\\n" "Please correct the error(s) and/or warning(s) by running command 'pci automake base base-devel git gcc glibc go libtool po4a' as root user.  You can do this without closing this session by running command \"$STARTBIN command 'pci automake base base-devel git gcc glibc go libtool po4a'\"in a new Termux session. Then you can return to this session and run '\${0##*/} \${ARGS[@]}' again."

espritfunctions.bash

@@ -10,13 +10,23 @@ ISOCOUNTRYCODES=([af]="Afghanistan" [ax]="Åland Islands" [al]="Albania" [dz]="A
 USERCOUNTRYCODE="$(getprop gsm.operator.iso-country || getprop gsm.sim.operator.iso-country)"
 printf "%s\\n" "Looking for ISO country code match;  Please wait a moment..."
 # if grep -i "$USERCOUNTRYCODE" <<< "${ISOCOUNTRYCODES[@]}" 1>/dev/null
-if "${ISOCOUNTRYCODES[$USERCOUNTRYCODE]}"
+if [[ ! -z ${ISOCOUNTRYCODES[$USERCOUNTRYCODE]:-} ]]
 then
-printf "%s" "Found ISO country code match [$USERCOUNTRYCODE]=\"${ISOCOUNTRYCODES[$USERCOUNTRYCODE]}\".  "
+printf '%s' "Found ISO country code match [$USERCOUNTRYCODE]=\"${ISOCOUNTRYCODES[$USERCOUNTRYCODE]}\";  "
+else
+printf '%s' "Could not find ISO country code match for ${USERCOUNTRYCODE:-UNKNOWNCOUNTRYCODE};  "
 fi
 printf "%s\\n" "Looking for ISO country code match;  DONE!  Continuing..."
 }
 
+_MRCOUNTRIESx86_() {
+MRCOUNTRIESx86="("Belarus" "France" "Germany" "Greece" "Russia" "Switzerland" "United States")"
+}
+
+_MRCOUNTRIESx86_64_() {
+MRCOUNTRIESx86_64="("Worldwide" "Australia" "Austria" "Bangladesh" "Belarus" "Belgium" "Bosnia and Herzegovina" "Brazil" "Bulgaria" "Canada" "Chile" "China" "Colombia" "Croatia" "Czechia" "Denmark" "Ecuador" "Finland" "France" "Georgia" "Germany" "Greece" "Hong Kong" "Hungary" "Iceland" "India" "Indonesia" "Iran" "Ireland" "Israel" "Italy" "Japan" "Kazakhstan" "Kenya" "Latvia" "Lithuania" "Luxembourg" "Moldova" "Netherlands" "New Caledonia" "New Zealand" "North Macedonia" "Norway" "Pakistan" "Paraguay" "Philippines" "Poland" "Portugal" "Romania" "Russia" "Serbia" "Singapore" "Slovakia" "Slovenia" "South Africa" "South Korea" "Spain" "Sweden" "Switzerland" "Taiwan" "Thailand" "Turkey" "Ukraine" "United Kingdom" "United States" "Vietnam")"
+}
+
 _BLOOM_() { # Bloom = `setupTermuxArch manual verbose`
 [[ -d "$HOME"/TermuxArchBloom ]] && _RMBLOOMQ_
 mkdir -p "$HOME"/TermuxArchBloom

printoutstatements.bash

@@ -15,7 +15,7 @@ FLHDR1[1]="# IFS=$'\\n\\t'"
 FLHDR1[2]="set -Eeuo pipefail"
 FLHDR1[3]="shopt -s nullglob globstar"
 FLHDR1[4]="unset LD_PRELOAD"
-FLHDR1[5]="VERSIONID=2.0.388"
+FLHDR1[5]="VERSIONID=2.0.389"
 FLHDR1[6]=""
 FLHDRP[0]="## BEGIN #####################################################################"
 FLHDRP[1]=""

setupTermuxArch

@@ -5,7 +5,7 @@
 # command 'setupTermuxArch h[elp]' has information how to use this file
 ################################################################################
 IFS=$'\n\t'
-VERSIONID=2.0.388
+VERSIONID=2.0.389
 set -Eeuo pipefail
 shopt -s nullglob globstar
 umask 0022
@@ -695,8 +695,8 @@ done
 
 _RMARCHRM_() {
 _SETROOT_EXCEPTION_
-find  "$INSTALLDIR/root/" -type l -delete 2>/dev/null ||:
-find  "$INSTALLDIR/home/" -type l -delete 2>/dev/null ||:
+find "$INSTALLDIR/root/" -maxdepth 2 -type l -delete 2>/dev/null ||:
+find "$INSTALLDIR/home/" -maxdepth 2 -type l -delete 2>/dev/null ||:
 rm -rf "${INSTALLDIR:?}"/* 2>/dev/null ||:
 find  "$INSTALLDIR" -type d -exec chmod 700 {} \; 2>/dev/null || _PSGI1ESTRING_ "find _RMARCHRM_ setupTermuxArch ${0##*/}"
 rm -rf "$INSTALLDIR" 2>/dev/null || _PSGI1ESTRING_ "rm -rf _RMARCHRM_ setupTermuxArch ${0##*/}"

setupTermuxArch.bash

@@ -5,7 +5,7 @@
 # command 'setupTermuxArch h[elp]' has information how to use this file
 ################################################################################
 IFS=$'\n\t'
-VERSIONID=2.0.388
+VERSIONID=2.0.389
 set -Eeuo pipefail
 shopt -s nullglob globstar
 umask 0022
@@ -695,8 +695,8 @@ done
 
 _RMARCHRM_() {
 _SETROOT_EXCEPTION_
-find  "$INSTALLDIR/root/" -type l -delete 2>/dev/null ||:
-find  "$INSTALLDIR/home/" -type l -delete 2>/dev/null ||:
+find "$INSTALLDIR/root/" -maxdepth 2 -type l -delete 2>/dev/null ||:
+find "$INSTALLDIR/home/" -maxdepth 2 -type l -delete 2>/dev/null ||:
 rm -rf "${INSTALLDIR:?}"/* 2>/dev/null ||:
 find  "$INSTALLDIR" -type d -exec chmod 700 {} \; 2>/dev/null || _PSGI1ESTRING_ "find _RMARCHRM_ setupTermuxArch ${0##*/}"
 rm -rf "$INSTALLDIR" 2>/dev/null || _PSGI1ESTRING_ "rm -rf _RMARCHRM_ setupTermuxArch ${0##*/}"

setupTermuxArch.sh

@@ -5,7 +5,7 @@
 # command 'setupTermuxArch h[elp]' has information how to use this file
 ################################################################################
 IFS=$'\n\t'
-VERSIONID=2.0.388
+VERSIONID=2.0.389
 set -Eeuo pipefail
 shopt -s nullglob globstar
 umask 0022
@@ -695,8 +695,8 @@ done
 
 _RMARCHRM_() {
 _SETROOT_EXCEPTION_
-find  "$INSTALLDIR/root/" -type l -delete 2>/dev/null ||:
-find  "$INSTALLDIR/home/" -type l -delete 2>/dev/null ||:
+find "$INSTALLDIR/root/" -maxdepth 2 -type l -delete 2>/dev/null ||:
+find "$INSTALLDIR/home/" -maxdepth 2 -type l -delete 2>/dev/null ||:
 rm -rf "${INSTALLDIR:?}"/* 2>/dev/null ||:
 find  "$INSTALLDIR" -type d -exec chmod 700 {} \; 2>/dev/null || _PSGI1ESTRING_ "find _RMARCHRM_ setupTermuxArch ${0##*/}"
 rm -rf "$INSTALLDIR" 2>/dev/null || _PSGI1ESTRING_ "rm -rf _RMARCHRM_ setupTermuxArch ${0##*/}"

setupTermuxArch.sha512

@@ -1 +1 @@
-31187ce310f2872d62b43030de8a8d29a7b7e8f3a9df102585b1d5b7cad2d84bd532843eda998e77948a887195e1753de119310e0f67172617c508de2e6ce73c  setupTermuxArch.tar.gz
+08ad2bd3f640239d139ea9dd00866fb946c0f7a3540d2b650ada407e4e40de63d5e4d5e4ec23e67e36fb6bcfca18ef86623849213732f664829757157ddea58d  setupTermuxArch.tar.gz

sha512.sum

@@ -1,30 +1,30 @@
 226baf6d6d8964bdaefd3321b50f6fabe55972e60dfd86a943cf8c51e32a1bbd3144003c06fa2d98b2bc625b2df6adec45987a41dc11671b12c22ded095c85f8  ./getimagefunctions.bash
-c8e1c356a66fe3d0eb654967ce36de6b3d67a9e771e2cbb92204a8f91e141eab540c64307e24c740a2ee4493c33dc998f69585395d84b3d5296de4df293ec36f  ./espritfunctions.bash
+429147006e86eb51851c9624e8ac4c584a72541db3d9a675e012e0e183d558375de1770a6115c1c5ff39de42eaef752eb5f4bc0db375078c58b7d290aed174a4  ./espritfunctions.bash
 cdbdd9c25333a8124f87902e33743114dae34565019012aa817a24aa324ad17dfd4a480629194d3c6d678b16eef8a9003749a1dbd88518a18ca3aee02eb057e3  ./necessaryfunctions.bash
 5c5fcc5e8edf82afdd683a2467241296f53f9d3b9214f47b74b39e6e086af82af7d58f1133ae8cde5aeeef10c7be506e870e35d86d21729d36ff1c226ce4994a  ./maintenanceroutines.bash
 20ade307e6d2f9ecfe688f67774f7d3eff6ddea509dfa7f30bd39787f31c8738de93e092f9b03beae8399d3bad1b07087d3f5c9b2955ab3d08a31d0fd3a1ce09  ./README.md
 8fa003af5524d81bfcd74663833f64bc00791a1ca7894f74bfaba8012736ed60beaf89ca932fd69a0fa3104e9a48944bc1a0b14634a41848688af6d409859024  ./CHANGE.log
-31187ce310f2872d62b43030de8a8d29a7b7e8f3a9df102585b1d5b7cad2d84bd532843eda998e77948a887195e1753de119310e0f67172617c508de2e6ce73c  ./setupTermuxArch.tar.gz
+08ad2bd3f640239d139ea9dd00866fb946c0f7a3540d2b650ada407e4e40de63d5e4d5e4ec23e67e36fb6bcfca18ef86623849213732f664829757157ddea58d  ./setupTermuxArch.tar.gz
 a168fe76a5e82133887351e1410042e628d4f79c753f58d449a6205659259267d287847f73c9366515b3132aaaa9aec69cf55349486a0de989f7dc02015062ec  ./knownconfigurations.bash
-a9df6a8a98c092f11c05730a9d9b11e211b41ef0dc00c42ae657fe1dcc45d99e28b2e50678854bc0ec82ea728395f8a1ffe2e432688f3a2de7109d35bed078d9  ./archlinuxconfig.bash
+f8761056aef134d5a820a023c5421c940c87a5d34cdccef96f5d0c0e4397e4604446654ab0f5fe07a6bf9521514c5c996bbb902f01a840e54230cf21ee4aad87  ./archlinuxconfig.bash
 05a502a845e35bc0495a3a3006ae914785c48679dddd362bd98bd33c306ed2aa8fac57344b1b65955d41755c3967f3e991770764f6c2f14c6a52f3e52e00ef1c  ./.github/FUNDING.yml
 5e20f4451f28b2ad8cd03e174bafa7c5d2d08cb3d9c6364a1f36b47fa1a2ae7e222970337f1481f149b6f87894f59e113bc49924776d558f0eb0773f6eebcd56  ./.github/workflows/label.yml
 ec770c00aa2c6225a2e27e8f08bd3d1eb8882f2cde94c820ab48db0b0fb0175913cd43a851904ff015c95f1fa31bb787383608cf19eb9d34f572b5fa8f9250ab  ./.github/workflows/greetings.yml
 4d98975d2749318d41060484f8c60a4f4e47f5a1c136bfe90d5d23e604613d83f7e0c90e2c1a7eb6828f50c911e85100f62ea413f3e42fe7fd1216b5a8b0b568  ./.github/workflows/stale.yml
 fdcfcc010ded1ca05a1ac51878f6fce049a7c3d3ca9b45d19a57ff8cac47a77eafbb50307e0fe22bf51364878d7f222d38dd2fa5a8eca5c33cdc6ed3830070f6  ./pullTermuxArchSubmodules.bash
 be4cf1b862e9843e359c08d8fbe90eff27e193a4f864b1937b3cad1fffecdf2374541eb21359fbe6b346e4bd1db4e223861878389f8e887f78ba06f53feb8eb7  ./.gitpod.yml
 1fbd5bbe1d7a8fad9bcbfe3410fab3ebbd1e79bc728b301eeb78b956357d3d0cd5829e500879e5621eb531147f2c2fc0e4f76f313dd515892bec6010bd3a2a00  ./LICENSE
-6b07ed1c4aa038e9fe2a08990e971e589e43b4a209952d85c09e531e77014c90b8035f082a47144df93ced7450fb528f7054ef3a296a3464d8d474cad64e4d67  ./setupTermuxArch
+88b1ca51875781b01b128c1a7c7ea0e7d8b22df5069158446cec966e9d25ad5a8f2a9df3e8170bc96a0ef998599f6f52fa049e618931ad3ed9f2299703947a04  ./setupTermuxArch
 9ae12dac3a7ad11cc929036d608e0113595925c48f6f9bf65af299bf01e1b0dbf9eedaa118c53bf957ae909c52e322bf7431b95ca0cc8517924321c678346dcb  ./sitemap.txt
 90559e5df2d5893d892680f9618863cd946d1677098b5c69edba59d8475b3d38f2e558e799bb4c85d354ef6abe232e31d90ca307a039d17db4bf402dc1f9786e  ./.gitmodules
-e777b9a75e67e98c6d11bd63d738e59b8b94e80a9c1936b1a0b6528125bb5515d5980243040fe997dbe3a328a332712a95c156c55b446930e3e98ff2f2bcc716  ./printoutstatements.bash
+bc992a517e65d223bfbff94c1883f1b82198814e1dfcdd394b12ff52787af91a6376fa25fa920a87ee520b78a872d92230df075015f105a9ee41a6c94f9e939e  ./printoutstatements.bash
 b6178b0fdb2f619b4be5034fbab5c42eba5f7ab699f7e6870e8203a7e22d0e0db7104675dc1f8f45cd8b2925eaddcfa14e217196e48537b6cf46d4448807deef  ./setupTermuxArchConfigs.bash
 e3e04c865fd494f4c6e2492d30ae34008073fdb652ebdd7f9d47cd34c065b8abbefea94247810522babbe83a617f08a1e3c43c0682dcfb1185752cd22130eab8  ./CONTRIBUTORS.md
 ccf293248249a718ec3e2dd92af558241a9510bbf575ed6af48158acc302cefd7b5cc41d30ac6e525c35de5afd396691a33a35890918d9b537046b1dcf8d7df0  ./404.md
-03c2068df3319a61a2aa9998030e95ec5ba8437a7e4a57d3c29aa3c685c95a5d0e472eebceeb68bb14f9d5c83498d380e870288b44318755be6c4674af33c065  ./.conf/VERSIONID
+87d7577290ca45b234d9cb5408a16b5b1e09258c0e267cd7ad43e2c285c140e35e7dc00778c674f7e7d0aaaedc133be860bd54a2e5b982adc8fae2f9aadfae9d  ./.conf/VERSIONID
 494c1a4bbb505fb3009f0e434530b6401adf6fb502fd0f01eb31b757e6dd397fd2e78dc603ef03de0f86faaa25fcb763f1b5b8c2aa397ff8f5cbda6728351722  ./NOTICE.md
 6f8a50ec0f811b35515666ecf5131bc59391a32a4760dd9994c64b2209544532dac4160c61dc0a53622b6453d34e6061b810e7a64bdcc853cf795e10d21ba3b8  ./robots.txt
-6b07ed1c4aa038e9fe2a08990e971e589e43b4a209952d85c09e531e77014c90b8035f082a47144df93ced7450fb528f7054ef3a296a3464d8d474cad64e4d67  ./setupTermuxArch.sh
-6b07ed1c4aa038e9fe2a08990e971e589e43b4a209952d85c09e531e77014c90b8035f082a47144df93ced7450fb528f7054ef3a296a3464d8d474cad64e4d67  ./setupTermuxArch.bash
+88b1ca51875781b01b128c1a7c7ea0e7d8b22df5069158446cec966e9d25ad5a8f2a9df3e8170bc96a0ef998599f6f52fa049e618931ad3ed9f2299703947a04  ./setupTermuxArch.sh
+88b1ca51875781b01b128c1a7c7ea0e7d8b22df5069158446cec966e9d25ad5a8f2a9df3e8170bc96a0ef998599f6f52fa049e618931ad3ed9f2299703947a04  ./setupTermuxArch.bash
 b9303b1c4ccd5cb151e65c243005e9bcf59182b02fb413d47a255672a85dc08adf323e754d1615f9ce5962e97b7824d2a78047cd56972c9109f3e7e5d1ab7a17  ./.gitpod.Dockerfile
-e3e1a2f9a2df0a5dc5e206a77d75b84bd0a3e09ffa1b84ee9db3bc368f0914fafc2810b3b43bc885a0bfe1b166b0e04f1633d8823801c92867cd826fec20896b  ./setupTermuxArch.sha512
+18d3f3e84db56d87ca19e0939bf29942c7e4e42a3d5c7d07e48ad9727f652ea55de41dcd48f41219bb04bdc88f36dce8ee78d3932cf40f161b5a27ebd4656333  ./setupTermuxArch.sha512