Skip to content

Commit

Permalink
Commit on 20180422 branch master 035498827
Browse files Browse the repository at this point in the history
  • Loading branch information
SDRausty committed Apr 22, 2018
1 parent 38315bb commit ed9464c
Show file tree
Hide file tree
Showing 13 changed files with 88 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jlam: contributed `getprop ro.product.device` Chromebook detection, `getprop ro.

[markfelt](https://github.com/markfelt) contributed [Succesfully Modified Stock 'makepkg'... #38](https://github.com/sdrausty/TermuxArch/issues/38) with instructions. Result: pending

[michalbednarski](https://github.com/michalbednarski) contributed Termux PRoot, discussed PRoot, contributed: `pacman-key --init` && `echo disable-scdaemon > /etc/pacman.d/gnupg/gpg-agent.conf` which resolved `pacman-key --populate archlinux` issuses, `export PROOT_NO_SECCOMP=1` resolving Android 8 installation issues. Result: TermuxArch greatly improved!
[michalbednarski](https://github.com/michalbednarski) contributed Termux PRoot, discussed PRoot, contributed: `pacman-key --init` && `echo disable-scdaemon > /etc/pacman.d/gnupg/gpg-agent.conf` which resolved `pacman-key --populate archlinux` issuses, `export PROOT_NO_SECCOMP=1` resolving Android 8 installation issues. Contributed kernel test for PRoot. Result: TermuxArch greatly improved!

[mjskoneg](https://github.com/mjskoneg) submitted issues. Result: TermuxArch improved!

Expand Down
12 changes: 12 additions & 0 deletions archsystemconfigs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,13 @@ addpc () {
# https://sdrausty.github.io/TermuxArch/CONTRIBUTORS Thank you for your help.
# https://sdrausty.github.io/TermuxArch/README has information about this project.
################################################################################
if [[ \$1 = "a" ]];then
pacman --noconfirm --color=always -Syu base base-devel emacs \${@:2}
elif [[ \$1 = "a8" ]];then
pacman --noconfirm --color=always -Syu base base-devel emacs jdk8-openjdk \${@:2}
else
pacman --noconfirm --color=always -Syu \$@
fi
trim
EOM
chmod 700 root/bin/pc
Expand All @@ -334,7 +340,13 @@ addpci () {
# https://sdrausty.github.io/TermuxArch/CONTRIBUTORS Thank you for your help.
# https://sdrausty.github.io/TermuxArch/README has information about this project.
################################################################################
if [[ \$1 = "a" ]];then
pacman --noconfirm --color=always -S base base-devel emacs \${@:2}
elif [[ \$1 = "a8" ]];then
pacman --noconfirm --color=always -Syu base base-devel emacs jdk8-openjdk \${@:2}
else
pacman --noconfirm --color=always -S \$@
fi
trim
EOM
chmod 700 root/bin/pci
Expand Down
2 changes: 2 additions & 0 deletions necessaryfunctions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,8 @@ runfinishsetupq () {
setlocaleconf () {
if ! grep en_US etc/locale.conf 2>/dev/null ; then
echo LANG=en_US.UTF-8 >> etc/locale.conf
echo LANGUAGE=en_US >> etc/locale.conf

fi
}

Expand Down
2 changes: 1 addition & 1 deletion printoutstatements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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 $file into $installdir. The option to create Arch Linux system users will be available through \033[1;32maddauser \033[1;34mand \033[1;32maddauserps\033[1;34m. Arch Linux user login from Termux with \033[1;32m$startbin \033[1;34mis now implemented thanks to user contributions and suggestions. See \033[0;36mAbility for Scripts to Launch Commands for Arch Linux in Termux PRoot on Device\033[1;34m https://github.com/sdrausty/TermuxArch/issues/54 for more information about these brand new options. Additional features of TermuxArch are also listed at https://github.com/sdrausty/TermuxArch/releases.\n\nWhile waiting, you can use \033[0;36mdf\033[1;34m, \033[0;36mdu -hs\033[1;34m, \033[0;36mhtop\033[1;34m, \033[0;36mps\033[1;34m, \033[0;36mtop\033[1;34m and \033[0;36mwatch\033[1;34m in a new Termux session to watch the uncompressing while the session completes. Use \033[0;36minfo query \033[1;34mand \033[0;36mman query \033[1;34mto learn more about your Linux system in the palm of your hand. See The Linux Documentation Project http://tldp.org to learn more about Linux and CLI commands. \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 $file into $installdir. The option to create Arch Linux system users will be available through \033[1;32maddauser \033[1;34mand \033[1;32maddauserps\033[1;34m. Arch Linux user login from Termux with \033[1;32m$startbin \033[1;34mis now implemented. See \033[0;36mAbility for Scripts to Launch Commands for Arch Linux in Termux PRoot on Device\033[1;34m https://github.com/sdrausty/TermuxArch/issues/54 for more information about these brand new options. Additional features of TermuxArch are also listed at https://github.com/sdrausty/TermuxArch/releases.\n\nWhile waiting, you can use \033[0;36mdf\033[1;34m, \033[0;36mdu -hs\033[1;34m, \033[0;36mhtop\033[1;34m, \033[0;36mps\033[1;34m, \033[0;36mtop\033[1;34m and \033[0;36mwatch\033[1;34m in a new Termux session to watch the uncompressing while the session completes. Use \033[0;36minfo query \033[1;34mand \033[0;36mman query \033[1;34mto learn more about your Linux system in the palm of your hand. See The Linux Documentation Project http://tldp.org to learn more about Linux and CLI commands. \033[1;37mUncompressing \033[37m$file\033[1;37m will take a long time; Be patient:\n\033[0m"
}

printmismatch () {
Expand Down
12 changes: 12 additions & 0 deletions scripts/files/stable/archsystemconfigs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,13 @@ addpc () {
# https://sdrausty.github.io/TermuxArch/CONTRIBUTORS Thank you for your help.
# https://sdrausty.github.io/TermuxArch/README has information about this project.
################################################################################
if [[ \$1 = "a" ]];then
pacman --noconfirm --color=always -Syu base base-devel emacs \${@:2}
elif [[ \$1 = "a8" ]];then
pacman --noconfirm --color=always -Syu base base-devel emacs jdk8-openjdk \${@:2}
else
pacman --noconfirm --color=always -Syu \$@
fi
trim
EOM
chmod 700 root/bin/pc
Expand All @@ -334,7 +340,13 @@ addpci () {
# https://sdrausty.github.io/TermuxArch/CONTRIBUTORS Thank you for your help.
# https://sdrausty.github.io/TermuxArch/README has information about this project.
################################################################################
if [[ \$1 = "a" ]];then
pacman --noconfirm --color=always -S base base-devel emacs \${@:2}
elif [[ \$1 = "a8" ]];then
pacman --noconfirm --color=always -Syu base base-devel emacs jdk8-openjdk \${@:2}
else
pacman --noconfirm --color=always -S \$@
fi
trim
EOM
chmod 700 root/bin/pci
Expand Down
2 changes: 2 additions & 0 deletions scripts/files/stable/necessaryfunctions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,8 @@ runfinishsetupq () {
setlocaleconf () {
if ! grep en_US etc/locale.conf 2>/dev/null ; then
echo LANG=en_US.UTF-8 >> etc/locale.conf
echo LANGUAGE=en_US >> etc/locale.conf

fi
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/files/stable/printoutstatements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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 $file into $installdir. The option to create Arch Linux system users will be available through \033[1;32maddauser \033[1;34mand \033[1;32maddauserps\033[1;34m. Arch Linux user login from Termux with \033[1;32m$startbin \033[1;34mis now implemented thanks to user contributions and suggestions. See \033[0;36mAbility for Scripts to Launch Commands for Arch Linux in Termux PRoot on Device\033[1;34m https://github.com/sdrausty/TermuxArch/issues/54 for more information about these brand new options. Additional features of TermuxArch are also listed at https://github.com/sdrausty/TermuxArch/releases.\n\nWhile waiting, you can use \033[0;36mdf\033[1;34m, \033[0;36mdu -hs\033[1;34m, \033[0;36mhtop\033[1;34m, \033[0;36mps\033[1;34m, \033[0;36mtop\033[1;34m and \033[0;36mwatch\033[1;34m in a new Termux session to watch the uncompressing while the session completes. Use \033[0;36minfo query \033[1;34mand \033[0;36mman query \033[1;34mto learn more about your Linux system in the palm of your hand. See The Linux Documentation Project http://tldp.org to learn more about Linux and CLI commands. \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 $file into $installdir. The option to create Arch Linux system users will be available through \033[1;32maddauser \033[1;34mand \033[1;32maddauserps\033[1;34m. Arch Linux user login from Termux with \033[1;32m$startbin \033[1;34mis now implemented. See \033[0;36mAbility for Scripts to Launch Commands for Arch Linux in Termux PRoot on Device\033[1;34m https://github.com/sdrausty/TermuxArch/issues/54 for more information about these brand new options. Additional features of TermuxArch are also listed at https://github.com/sdrausty/TermuxArch/releases.\n\nWhile waiting, you can use \033[0;36mdf\033[1;34m, \033[0;36mdu -hs\033[1;34m, \033[0;36mhtop\033[1;34m, \033[0;36mps\033[1;34m, \033[0;36mtop\033[1;34m and \033[0;36mwatch\033[1;34m in a new Termux session to watch the uncompressing while the session completes. Use \033[0;36minfo query \033[1;34mand \033[0;36mman query \033[1;34mto learn more about your Linux system in the palm of your hand. See The Linux Documentation Project http://tldp.org to learn more about Linux and CLI commands. \033[1;37mUncompressing \033[37m$file\033[1;37m will take a long time; Be patient:\n\033[0m"
}

printmismatch () {
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 @@ -648,13 +648,13 @@ cpuabi8="arm64-v8a"
cpuabix86="x86"
cpuabix8664="x86_64"
declare -g args=$@
dfl=/gen
#dfl=/gen
dmverbose="-q"
#dmverbose="-v"
export PROOT_NO_SECCOMP=1
stime=`date +%s|grep -o '....$'`
unset LD_PRELOAD
versionid="gen.v1.6 id723736258"
versionid="v1.6"
if [[ $commandif = "" ]];then
echo Run \`setupTermuxArch.sh\` from the Android system in Termux.
Expand Down
42 changes: 42 additions & 0 deletions scripts/frags/proot/ktest.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!/bin/bash -e
# Copyright 2017-2018 by SDRausty. All rights reserved. 🌎 🌍 🌏 🌐 🗺
# Hosting https://sdrausty.github.io/TermuxArch courtesy https://pages.github.com
# https://sdrausty.github.io/TermuxArch/CONTRIBUTORS Thank you for your help.
# https://sdrausty.github.io/TermuxArch/README has information about TermuxArch.
################################################################################
clangif () {
if [ ! -x $PREFIX/bin/clang ];then
printf "\n\033[1;34mInstalling \033[0;32mclang\033[1;34m…\n\n\033[1;32m"
pkg install clang --yes
printf "\n\033[1;34mInstalling \033[0;32mclang\033[1;34m: \033[1;32mDONE\n\n\033[0m"
fi
if [ ! -x $PREFIX/bin/clang ];then
pe
fi
}

addtestapp () {
cat > testapp.c <<- EOM
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
int main() {
int a = open("nonexistent-test-file-a", O_RDONLY);
int ae = errno;
int b = open("nonexistent-test-dir/nonexistent-test-file-b", O_RDONLY);
int be = errno;
int c = open("nonexistent-test-file-c", O_RDONLY);
int ce = errno;
printf("[%d %d %d %d %d %d]\n", a, ae, b, be, c, ce);
}
EOM
chmod 770 testapp.c
}

clangif
addtestapp

printf "\n\033[1;32mPRoot test results:\n\n\033[0m"
clang testapp.c -o testapp
PROOT_NO_SECCOMP=1 proot ./testapp
printf "\n\033[0m"
Binary file added scripts/frags/proot/testapp
Binary file not shown.
12 changes: 12 additions & 0 deletions scripts/frags/proot/testapp.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
int main() {
int a = open("nonexistent-test-file-a", O_RDONLY);
int ae = errno;
int b = open("nonexistent-test-dir/nonexistent-test-file-b", O_RDONLY);
int be = errno;
int c = open("nonexistent-test-file-c", O_RDONLY);
int ce = errno;
printf("[%d %d %d %d %d %d]\n", a, ae, b, be, c, ce);
}
2 changes: 1 addition & 1 deletion setupTermuxArch.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9f95f99a045a552d4c37f5167180df6050ab4408ea36587bf6746eaf4a569c6e754c1dc60aeca5456fd5d092354500f7c68f665cf82d983a42292c14f3a42df7 setupTermuxArch.tar.gz
85b96c61b1685307905574a3bfd1031d8cb14e65d85cd0e1c9072b885faaf785dbc57b648b9bcea28b88f49aaf19fd5077f6377bb32225231fc80314da689b61 setupTermuxArch.tar.gz
Binary file modified setupTermuxArch.tar.gz
Binary file not shown.

0 comments on commit ed9464c

Please sign in to comment.