commit 652264188 on 20201128

.conf/VERSIONID

@@ -1 +1 @@
-2.0.393
+2.0.394

archlinuxconfig.bash

@@ -10,7 +10,8 @@ cat >> usr/local/bin/addauser <<- EOM
 _HUSDIRC_() {
 if [ "\$UID" != "0" ]
 then
-printf "\\\\e[1;31mUSAGE:\\\\e[1;37m %s\\\\e[1;32m: Exiting...\\\\e[0m\\\\n" "Script '\${0##*/}' should be run using the root account, not the '\$(whoami)' account.  Alternatively '\${0##*/}' can be prefixed with the command 'sudo'"
+WHOAMI="\$(whoami)"
+printf "\\\\e[1;31mUSAGE:\\\\e[1;37m %s\\\\e[1;32m: Exiting...\\\\e[0m\\\\n" "Script '\${0##*/}' should be run using the root account, not the '\$WHOAMI' account.  Alternatively '\${0##*/}' can be used with the 'sudo' command;  'sudo \${0##*/} user'."
 exit 202
 fi
 if [ \$# = 0 ]

necessaryfunctions.bash

@@ -138,7 +138,15 @@ fi
 
 _DOMIRROR_() { # partial implementaion: choose the corrrect mirror and test this mirror website
 _DOCEMIRROR_() {
-USERCOUNTRYCODE="$(getprop gsm.operator.iso-country || getprop gsm.sim.operator.iso-country)"
+USERCOUNTRYCODE="$(getprop gsm.operator.iso-country)"
+if [[ -z "${USERCOUNTRYCODE:-}" ]]
+then
+USERCOUNTRYCODE="$(getprop gsm.sim.operator.iso-country)"
+fi
+if [[ -z "${USERCOUNTRYCODE:-}" ]]
+then
+USERCOUNTRYCODE="us"
+fi
 printf "Copying file '%s' to file '%s';  " "$INSTALLDIR/etc/pacman.d/mirrorlist" "$INSTALLDIR/etc/pacman.d/mirrorlist.$STIME.termuxarchnew"
 cp "$INSTALLDIR/etc/pacman.d/mirrorlist" "$INSTALLDIR/etc/pacman.d/mirrorlist.$STIME.termuxarchnew"
 printf "DONE\\n"
@@ -261,10 +269,12 @@ if [[ "${LCR:-}" -eq 3 ]] || [[ "${LCR:-}" -eq 4 ]] || [[ "${LCR:-}" -eq 5 ]] ||
 then
 if [[ "$CPUABI" = "$CPUABIX86_64" ]]
 then
-printf "%s\\n" "pacman -Su grep gzip patch sed sudo unzip --noconfirm --color=always || pacman -Su gzip patch sed sudo unzip --noconfirm --color=always || _PMFSESTRING_ \"pacman -Su gzip patch sed sudo unzip $BINFNSTP ${0##/*}\"" >> root/bin/"$BINFNSTP"
+printf "%s\\n" "pacman -Su glibc grep gzip sed sudo --noconfirm --color=always || pacman -Su glibc grep gzip sed sudo  --noconfirm --color=always || _PMFSESTRING_ \"pacman -Su glibc grep gzip sed sudo $BINFNSTP ${0##/*}\"" >> root/bin/"$BINFNSTP"
 elif [[ "$CPUABI" = "$CPUABIX86" ]] || [[ "$CPUABI" = i386 ]]
 then
-printf "%s\\n" "pacman -Su sudo --noconfirm --color=always || pacman -Su sudo --noconfirm --color=always || _PMFSESTRING_ \"pacman -Su sudo $BINFNSTP ${0##/*}\"" >> root/bin/"$BINFNSTP"
+printf "%s\\n" "pacman -Su glibc sudo --noconfirm --color=always || pacman -Su glibc sudo --noconfirm --color=always || _PMFSESTRING_ \"pacman -Su sudo $BINFNSTP ${0##/*}\"" >> root/bin/"$BINFNSTP"
+else
+printf "%s\\n" "pacman -Su glibc --noconfirm --color=always || pacman -Su glibc --noconfirm --color=always || _PMFSESTRING_ \"pacman -Su glibc $BINFNSTP ${0##/*}\"" >> root/bin/"$BINFNSTP"
 fi
 fi
 cat >> root/bin/"$BINFNSTP" <<- EOM
@@ -475,6 +485,9 @@ curl --retry 4 "$AL32MRLT" -o "$ALMLLOCN"
 _DOMIRROR_
 elif [[ "$CPUABI" = "$CPUABIX86_64" ]]
 then
+AL64MRLT="https://www.archlinux.org/mirrorlist/all/"
+printf "\\e[0m\\n%s\\n" "Updating ${ALMLLOCN##*/} from $AL64MRLT."
+curl --retry 4 "$AL64MRLT" -o "$ALMLLOCN"
 _DOMIRROR_
 fi
 printf "\\e[0m"

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.392"
+FLHDR1[5]="VERSIONID=2.0.393"
 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.392
+VERSIONID=2.0.393
 set -Eeuo pipefail
 shopt -s nullglob globstar
 umask 0022

setupTermuxArch.bash

@@ -5,7 +5,7 @@
 # command 'setupTermuxArch h[elp]' has information how to use this file
 ################################################################################
 IFS=$'\n\t'
-VERSIONID=2.0.392
+VERSIONID=2.0.393
 set -Eeuo pipefail
 shopt -s nullglob globstar
 umask 0022

setupTermuxArch.sh

@@ -5,7 +5,7 @@
 # command 'setupTermuxArch h[elp]' has information how to use this file
 ################################################################################
 IFS=$'\n\t'
-VERSIONID=2.0.392
+VERSIONID=2.0.393
 set -Eeuo pipefail
 shopt -s nullglob globstar
 umask 0022

setupTermuxArch.sha512

@@ -1 +1 @@
-6bb9e9dfa305ceb2c1ed74f609867ab2928f6c6255403f3a5ee17f0a761924063ba9ef71ddfb3c832bf11a4cafe488ea39980a1f94f62689ab62d14b41048ab8  setupTermuxArch.tar.gz
+a61b273ab8d144e813da768031c29f46a014bca9cf59b76d6e400a03a3a603621148805cb36d0d811d2d99eed7eca2d5f16bf1dc558edc606087e24825d07037  setupTermuxArch.tar.gz

sha512.sum

@@ -1,30 +1,30 @@
 226baf6d6d8964bdaefd3321b50f6fabe55972e60dfd86a943cf8c51e32a1bbd3144003c06fa2d98b2bc625b2df6adec45987a41dc11671b12c22ded095c85f8  ./getimagefunctions.bash
 2abda2d34b256e70b623f3123fd6decdbb01165878eeeda29725ab3ab7c206eb61957caa9c6b8fc52530fce83f14b1c31dcd914c1ea9fa95bd9a46a1ce4df31d  ./espritfunctions.bash
-a9211af2e43638cfe32ad61b06da8d54752e9b4cc5cb198ca0ecf34879b9cd8f1f8b153fa7e9f79b99c25b810bcc9fa7cfd260d3efc9cd7613f7d3646f372d98  ./necessaryfunctions.bash
+19c518d516c3f2673f558969d588aaaa91d4226ac3b5433f96316c0ac0d207eae3802d199b3900c41d6744c3a281d4254f82391ac2e48e38be48f828db16c236  ./necessaryfunctions.bash
 5c5fcc5e8edf82afdd683a2467241296f53f9d3b9214f47b74b39e6e086af82af7d58f1133ae8cde5aeeef10c7be506e870e35d86d21729d36ff1c226ce4994a  ./maintenanceroutines.bash
 20ade307e6d2f9ecfe688f67774f7d3eff6ddea509dfa7f30bd39787f31c8738de93e092f9b03beae8399d3bad1b07087d3f5c9b2955ab3d08a31d0fd3a1ce09  ./README.md
 8fa003af5524d81bfcd74663833f64bc00791a1ca7894f74bfaba8012736ed60beaf89ca932fd69a0fa3104e9a48944bc1a0b14634a41848688af6d409859024  ./CHANGE.log
-6bb9e9dfa305ceb2c1ed74f609867ab2928f6c6255403f3a5ee17f0a761924063ba9ef71ddfb3c832bf11a4cafe488ea39980a1f94f62689ab62d14b41048ab8  ./setupTermuxArch.tar.gz
+a61b273ab8d144e813da768031c29f46a014bca9cf59b76d6e400a03a3a603621148805cb36d0d811d2d99eed7eca2d5f16bf1dc558edc606087e24825d07037  ./setupTermuxArch.tar.gz
 a168fe76a5e82133887351e1410042e628d4f79c753f58d449a6205659259267d287847f73c9366515b3132aaaa9aec69cf55349486a0de989f7dc02015062ec  ./knownconfigurations.bash
-bd5a0c7a4f171f9959308a216bc48eb98fac64f5dd16c610296dd76f3e9d4ebad3d9c2dead767b1a0915ca5a09f6eea4891ff6539c6d22941f6777f05b64af54  ./archlinuxconfig.bash
+ef47b7c3f381fd0499bc92caae590944c9f8214ec621a69594ebeab3149f8436290122f8f25b9ffadd2700494e9d64f527fcb288f6aab0ec92e1e6b53a65efd2  ./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
-31cf87af8f6828b0bbed9d54870a134bf68c0441d9942bcd02429f87da75e2755722049a1c6a83a9a3e9f14005980b162118a77707040b2e58067f6506ef5b5c  ./setupTermuxArch
+610a232fd4030b8e7b637603911d914c3ffcef510316b2d1e8582613a10d5964c85993b9266c54a71ce8683a76e44a69a77424ccc7354997485d38b63a47589e  ./setupTermuxArch
 9ae12dac3a7ad11cc929036d608e0113595925c48f6f9bf65af299bf01e1b0dbf9eedaa118c53bf957ae909c52e322bf7431b95ca0cc8517924321c678346dcb  ./sitemap.txt
 90559e5df2d5893d892680f9618863cd946d1677098b5c69edba59d8475b3d38f2e558e799bb4c85d354ef6abe232e31d90ca307a039d17db4bf402dc1f9786e  ./.gitmodules
-7198e4333c87e79e1b8ef61daafcb35a16ec2c66fd4f02ce95cc78add8d62e616d2ef1b744d4ff292576856b132dd3c12323a53921a60fdeae61dbaff68404bb  ./printoutstatements.bash
+bda505815a954409c235f9abad0e209082558bd0516527fde39439f0ad7d32856de3e6f1c8cd974ecaaa56972d8349bd9b937d4749bad1426a27f13f6c47028a  ./printoutstatements.bash
 b6178b0fdb2f619b4be5034fbab5c42eba5f7ab699f7e6870e8203a7e22d0e0db7104675dc1f8f45cd8b2925eaddcfa14e217196e48537b6cf46d4448807deef  ./setupTermuxArchConfigs.bash
 e3e04c865fd494f4c6e2492d30ae34008073fdb652ebdd7f9d47cd34c065b8abbefea94247810522babbe83a617f08a1e3c43c0682dcfb1185752cd22130eab8  ./CONTRIBUTORS.md
 ccf293248249a718ec3e2dd92af558241a9510bbf575ed6af48158acc302cefd7b5cc41d30ac6e525c35de5afd396691a33a35890918d9b537046b1dcf8d7df0  ./404.md
-41805d1ee8d84c4e059d7c2dd659791a80bc6d19f956e483317e8ebb31f396c8c1359f50f0130d58b4e895e314cc1337b853d72a86a156b91599d9db652bb35d  ./.conf/VERSIONID
+4ed37a50748711aa774f97b29554291edeffc949f76ea126425b44fc759057cb0170f7224a4eecf95ac6c0fd153e6bc8363160e2b57671481f08b964312bf88a  ./.conf/VERSIONID
 494c1a4bbb505fb3009f0e434530b6401adf6fb502fd0f01eb31b757e6dd397fd2e78dc603ef03de0f86faaa25fcb763f1b5b8c2aa397ff8f5cbda6728351722  ./NOTICE.md
 6f8a50ec0f811b35515666ecf5131bc59391a32a4760dd9994c64b2209544532dac4160c61dc0a53622b6453d34e6061b810e7a64bdcc853cf795e10d21ba3b8  ./robots.txt
-31cf87af8f6828b0bbed9d54870a134bf68c0441d9942bcd02429f87da75e2755722049a1c6a83a9a3e9f14005980b162118a77707040b2e58067f6506ef5b5c  ./setupTermuxArch.sh
-31cf87af8f6828b0bbed9d54870a134bf68c0441d9942bcd02429f87da75e2755722049a1c6a83a9a3e9f14005980b162118a77707040b2e58067f6506ef5b5c  ./setupTermuxArch.bash
+610a232fd4030b8e7b637603911d914c3ffcef510316b2d1e8582613a10d5964c85993b9266c54a71ce8683a76e44a69a77424ccc7354997485d38b63a47589e  ./setupTermuxArch.sh
+610a232fd4030b8e7b637603911d914c3ffcef510316b2d1e8582613a10d5964c85993b9266c54a71ce8683a76e44a69a77424ccc7354997485d38b63a47589e  ./setupTermuxArch.bash
 b9303b1c4ccd5cb151e65c243005e9bcf59182b02fb413d47a255672a85dc08adf323e754d1615f9ce5962e97b7824d2a78047cd56972c9109f3e7e5d1ab7a17  ./.gitpod.Dockerfile
-192ddcfe990cb6aaa0e183e86f80337e173a605ad91004fd6445ad7a185c88ed7a699665871b3f24cfe3fd78a3b954277cd016a61a4022e6cff5b9883669228d  ./setupTermuxArch.sha512
+c0f3203628ff337742bc256eee30d8122972be75fee147b8082b548396a396ec0f7ee8486326f6cce413970c5dc7bf61dc980eec472eb5457730d0799cdb5e21  ./setupTermuxArch.sha512