Commit on 20181010 branch master 4992024480274

archlinuxconfig.sh

@@ -429,7 +429,7 @@ addkeys() {
 	elif [[ "\$1" = x86 ]]
 	then
 		KEYRINGS[0]="archlinux-keyring"
-		KEYRINGS[1]="archlinux32-keyring-transition"
+		KEYRINGS[1]="archlinux32-keyring"
 		KEYRINGS[2]="ca-certificates-utils"
 	elif [[ "\$1" = x86_64 ]]
 	then
@@ -447,8 +447,8 @@ addkeys() {
 	pacman-key --init ||: 
 	chmod 700 /etc/pacman.d/gnupg ||:
 	pacman-key --populate ||: 
-	printf "\n\e[1;32m==>\e[0m Running \e[1mpacman -Sy \$ARGS --noconfirm --color=always\e[0;32m…\n"
-	pacman -Sy  "\${KEYRINGS[@]}" --noconfirm --color=always ||: 
+	printf "\n\e[1;32m==>\e[0m Running \e[1mpacman -Syy \$ARGS --noconfirm --color=always\e[0;32m…\n"
+	pacman -Syy  "\${KEYRINGS[@]}" --noconfirm --color=always ||: 
 	printf "\n\e[0;34mWhen \e[1;37mAppending keys from archlinux.gpg\e[0;34m appears on the screen, the installation process can be accelerated.  The system desires a lot of entropy at this part of the install procedure.  To generate as much entropy as possible quickly, watch and listen to a file on your device.  \n\nThe program \e[1;32mpacman-key\e[0;34m will want as much entropy as possible when generating keys.  Entropy is also created through tapping, sliding, one, two and more fingers tapping with short and long taps.  When \e[1;37mAppending keys from archlinux.gpg\e[0;34m appears on the screen, use any of these simple methods to accelerate the installation process if it is stalled.  Put even simpler, just do something on device.  Browsing files will create entropy on device.  Slowly swiveling the device in space and time will accelerate the installation process.  This method alone might not generate enough entropy (a measure of randomness in a closed system) for the process to complete quickly.  Use \e[1;32mbash ~${DARCH}/root/bin/we \e[0;34min a new Termux session to watch entropy on device.\n\n\e[1;32m==>\e[0m Running \e[1mpacman-key --populate\e[0;32m…\n"
 	_GENEN_
 	pacman-key --populate ||: 
@@ -532,7 +532,7 @@ addpci() {
 	printf "\\\\n\\\\e[1;32m==> \\\\e[1;37m%s \\\\e[1;32m%s %s %s \\\e[0m%s…\\\\n\\\\n" "Running" "TermuxArch \$(basename "\$0")" "\$ARGS" "\$VERSIONID"  
 	if [[ -z "\${1:-}" ]]
 	then
-	pacman -Syu --noconfirm --color=always 
+	pacman -Syuu --noconfirm --color=always 
 	elif [[ "\$1" = "e" ]]
 	then
 	pacman -Syu base base-devel emacs "\${@:2}" --noconfirm --color=always  

necessaryfunctions.sh

@@ -200,13 +200,6 @@ _MAKEFINISHSETUP_() {
 	then
 		grep "proxy" "$HOME"/.profile | grep "export" >> root/bin/"$BINFNSTP" 2>/dev/null ||:
 	fi
-	if [[ "${LCR:-}" != 2 ]]
-	then
-		cat >> root/bin/"$BINFNSTP" <<- EOM
-		printf "\\n\\e[0;32m%s\\e[1;32m%s\\e[0;32m%s\\e[1;32m%s\\e[0;32m%s\\e[1;32m%s\\e[0;32m%s\\e[1;32m%s\\e[0;32m%s\\n\\n\\e[1;32m%s\\e[0;32m" "To generate locales in a preferred language use " "Settings > Language & Keyboard > Language " "in Android; Then run " "${0##*/} r " "for a quick system refresh; For full system refresh use " "${0##*/} refresh" ".  Run " "${0##*/} re" " to only refresh the user files without running locale-gen." "==> " 
-		locale-gen ||: 
-		EOM
-	fi
 	if [[ -z "${LCR:-}" ]] 
 	then
 		cat >> root/bin/"$BINFNSTP" <<- EOM
@@ -238,6 +231,13 @@ _MAKEFINISHSETUP_() {
 			printf "./root/bin/pci \\n" >> root/bin/"$BINFNSTP"
 		fi
 	fi
+	if [[ "${LCR:-}" != 2 ]]
+	then
+		cat >> root/bin/"$BINFNSTP" <<- EOM
+		printf "\\n\\e[0;32m%s\\e[1;32m%s\\e[0;32m%s\\e[1;32m%s\\e[0;32m%s\\e[1;32m%s\\e[0;32m%s\\e[1;32m%s\\e[0;32m%s\\n\\n\\e[1;32m%s\\e[0;32m" "To generate locales in a preferred language use " "Settings > Language & Keyboard > Language " "in Android; Then run " "${0##*/} r " "for a quick system refresh; For full system refresh use " "${0##*/} refresh" ".  Run " "${0##*/} re" " to only refresh the user files without running locale-gen." "==> " 
+		locale-gen ||: 
+		EOM
+	fi
 	cat >> root/bin/"$BINFNSTP" <<- EOM
 	printf "\\n\\e[1;34m%s  \\e[0m" "🕛 > 🕤 Arch Linux in Termux is installed and configured 📲 " 
 	printf "\\e]2;%s\\007" " 🕛 > 🕤 Arch Linux in Termux is installed and configured 📲 "

printoutstatements.sh

@@ -16,7 +16,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=v1.6.5.id2775"
+FLHDR1[5]="VERSIONID=v1.6.5.id4119"
 FLHDR1[6]=" "
 FLHDRP[0]="## BEGIN #######################################################################"
 FLHDRP[1]=""

setupTermuxArch.sh

@@ -8,7 +8,7 @@ IFS=$'\n\t'
 set -Eeuo pipefail
 shopt -s nullglob globstar
 unset LD_PRELOAD
-VERSIONID="v1.6.5.id2775"
+VERSIONID="v1.6.5.id4119"
 
 _SET_TRAP_ERROR_() { # Run on script error.
 	local RV="$?"

setupTermuxArch.sha512

@@ -1 +1 @@
-e2ef8e0b7c168acd36b10d9f538fc86692f73d2d04da2212b6d588566636527c25a61705fb7a95c4b20dabcb92c790ee661a902f79b5f81ba9b67df1385c0579  setupTermuxArch.tar.gz
+b1a57aa3994c4bae32467f8976323a3cf42c7000abaa3a4e8ff0222fecc2d68aa035fb6072e083d6e7f54f3171c95eee342a15c638a67044c400c26188bfdfb9  setupTermuxArch.tar.gz