Skip to content

Commit

Permalink
Commit on 20180308 branch master 774485363
Browse files Browse the repository at this point in the history
  • Loading branch information
SDRausty committed Mar 9, 2018
1 parent 9de720c commit 36c1d3c
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 27 deletions.
53 changes: 42 additions & 11 deletions necessaryfunctions.sh

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion printoutstatements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ printmd5error ()

printmd5success ()
{
printf '\033]2; 🕛 > 🕡 Uncompressing the image file. This will take a long time; Be patient.\007'"\033[0;34m 🕛 > 🕕 \033[1;34mSystem image file download integrity: \033[1;32mOK\n\n\033[0;34m 🕛 > 🕡 \033[1;34mUncompressing \033[1;34m$file\033[1;34m into \033[1;32m$HOME$rootdir\033[1;34m. The option to install additional languages with Arch Linux in Termux PRoot will appear soon followed by \033[1;32mtzselect\033[1;34m. Add the \033[1;32mtzselect\033[1;34m output code to \033[1;32m.bash_profile\033[1;34m so the system time in Arch Linux for future sessions will be set correctly. For curiosity while waiting use \033[0;36mdf\033[1;34m, \033[0;36mdu -hs\033[1;34m, \033[0;36mtop\033[1;34m and \033[0;36mwatch\033[1;34m in a new Termux session while this session completes. \033[1;37mUncompressing \033[37m$file\033[1;37m will take a long time; Be patient:\n\033[0m"
printf '\033]2; 🕛 > 🕡 Uncompressing the image file. This will take a long time; Be patient.\007'"\033[0;34m 🕛 > 🕕 \033[1;34mSystem image file download integrity: \033[1;32mOK\n\n\033[0;34m 🕛 > 🕡 \033[1;34mUncompressing \033[1;34m$file\033[1;34m into \033[1;32m$HOME$rootdir\033[1;34m. The option to install additional languages with Arch Linux in Termux PRoot will appear soon followed by \033[1;32mtzselect\033[1;34m. Add the \033[1;32mtzselect\033[1;34m output code to \033[1;32m.bash_profile\033[1;34m so the system time in Arch Linux for future sessions will be set correctly. While waiting use \033[0;36mdf\033[1;34m, \033[0;36mdu -hs\033[1;34m, \033[0;36mtop\033[1;34m and \033[0;36mwatch\033[1;34m in a new Termux session while this session completes. Use \033[0m\033[34minfo <query> \033[0m\033[mand \033[0m\033[34mman <query> \033[0m\033[1;34m to learn more. \033[1;37mUncompressing \033[37m$file\033[1;37m will take a long time; Be patient:\n\033[0m"
}

printmismatch ()
Expand Down
53 changes: 42 additions & 11 deletions scripts/files/stable/necessaryfunctions.sh

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/files/stable/printoutstatements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ printmd5error ()

printmd5success ()
{
printf '\033]2; 🕛 > 🕡 Uncompressing the image file. This will take a long time; Be patient.\007'"\033[0;34m 🕛 > 🕕 \033[1;34mSystem image file download integrity: \033[1;32mOK\n\n\033[0;34m 🕛 > 🕡 \033[1;34mUncompressing \033[1;34m$file\033[1;34m into \033[1;32m$HOME$rootdir\033[1;34m. The option to install additional languages with Arch Linux in Termux PRoot will appear soon followed by \033[1;32mtzselect\033[1;34m. Add the \033[1;32mtzselect\033[1;34m output code to \033[1;32m.bash_profile\033[1;34m so the system time in Arch Linux for future sessions will be set correctly. For curiosity while waiting use \033[0;36mdf\033[1;34m, \033[0;36mdu -hs\033[1;34m, \033[0;36mtop\033[1;34m and \033[0;36mwatch\033[1;34m in a new Termux session while this session completes. \033[1;37mUncompressing \033[37m$file\033[1;37m will take a long time; Be patient:\n\033[0m"
printf '\033]2; 🕛 > 🕡 Uncompressing the image file. This will take a long time; Be patient.\007'"\033[0;34m 🕛 > 🕕 \033[1;34mSystem image file download integrity: \033[1;32mOK\n\n\033[0;34m 🕛 > 🕡 \033[1;34mUncompressing \033[1;34m$file\033[1;34m into \033[1;32m$HOME$rootdir\033[1;34m. The option to install additional languages with Arch Linux in Termux PRoot will appear soon followed by \033[1;32mtzselect\033[1;34m. Add the \033[1;32mtzselect\033[1;34m output code to \033[1;32m.bash_profile\033[1;34m so the system time in Arch Linux for future sessions will be set correctly. While waiting use \033[0;36mdf\033[1;34m, \033[0;36mdu -hs\033[1;34m, \033[0;36mtop\033[1;34m and \033[0;36mwatch\033[1;34m in a new Termux session while this session completes. Use \033[0m\033[34minfo <query> \033[0m\033[mand \033[0m\033[34mman <query> \033[0m\033[1;34m to learn more. \033[1;37mUncompressing \033[37m$file\033[1;37m will take a long time; Be patient:\n\033[0m"
}

printmismatch ()
Expand Down
8 changes: 8 additions & 0 deletions scripts/files/working/necessaryfunctions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,15 @@ makestartbin ()
EOM
if [[ "$kid" -eq 1 ]]; then
cat >> $bin <<- EOM
if [[ \$1 = [Cc]* ]] || [[ \$1 = -[Cc]* ]] || [[ \$1 = --[Cc]* ]];then
exec proot --kill-on-exit --kernel-release=4.14.15 --link2symlink -0 -r $HOME$rootdir/ -b /dev/ -b /sys/ -b /proc/ -b /storage/ -b $HOME -w $HOME /bin/env -i HOME=/root TERM="$TERM" PS1='[termux@arch \W]\$ ' LANG=$LANG PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash -lc \$@ ||:
elif [[ \$1 = [Ll]* ]] || [[ \$1 = -[Ll]* ]] || [[ \$1 = --[Ll]* ]] || [[ \$1 = [Ss]* ]] || [[ \$1 = -[Ss]* ]] || [[ \$1 = --[Ss]* ]];then
exec proot --kill-on-exit --kernel-release=4.14.15 --link2symlink -0 -r $HOME$rootdir/ -b /dev/ -b /sys/ -b /proc/ -b /storage/ -b $HOME -w $HOME /bin/env -i HOME=/root TERM="$TERM" PS1='[termux@arch \W]\$ ' LANG=$LANG PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/su - \$@ ||:
elif [[ \$1 = [Rr]* ]] || [[ \$1 = -[Rr]* ]] || [[ \$1 = --[Rr]* ]];then
exec proot --kill-on-exit --kernel-release=4.14.15 --link2symlink -0 -r $HOME$rootdir/ -b /dev/ -b /sys/ -b /proc/ -b /storage/ -b $HOME -w $HOME /bin/env -i HOME=/root TERM="$TERM" PS1='[termux@arch \W]\$ ' LANG=$LANG PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/\$@ ||:
else
exec proot --kill-on-exit --kernel-release=4.14.15 --link2symlink -0 -r $HOME$rootdir/ -b /dev/ -b /sys/ -b /proc/ -b /storage/ -b $HOME -w $HOME /bin/env -i HOME=/root TERM="$TERM" PS1='[termux@arch \W]\$ ' LANG=$LANG PATH=/bin:/usr/bin:/sbin:/usr/sbin /bin/bash --login ||:
fi
EOM
else
cat >> $bin <<- EOM
Expand Down
4 changes: 2 additions & 2 deletions scripts/files/working/setupTermuxArch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -639,13 +639,13 @@ wgetif ()

args=$@
bin=startarch
dfl=/gen
#dfl=/gen
#dm=curl
dm=wget
dmverbose="-q"
#dmverbose="-v"
stime=`date +%s|grep -o '....$'`
versionid="gen.v1.1 id364069021"
versionid="v1.1"

setrootdir

Expand Down
2 changes: 1 addition & 1 deletion setupTermuxArch.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
90891998aa6a80f4d617a8bbe72eaedce3daaec38490ced0d144a0af7b993889d9fa257093e0c1fdde04878f7982648cf32456642dc2210303453a9694f039ce setupTermuxArch.tar.gz
9d78cec8607ac14de955fda6ba13907c54d4ed5fd76beb124c57eb5d16810712dd0bad3177cc231e28c56551246b63f75f0ffa012b73dd89430c1b99d287382c setupTermuxArch.tar.gz
Binary file modified setupTermuxArch.tar.gz
Binary file not shown.

0 comments on commit 36c1d3c

Please sign in to comment.