Skip to content

Commit

Permalink
Commit on 20180308 branch master 364069021
Browse files Browse the repository at this point in the history
  • Loading branch information
SDRausty committed Mar 9, 2018
1 parent 8ab28ed commit 9de720c
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gen/setupTermuxArch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ dm=wget
dmverbose="-q"
#dmverbose="-v"
stime=`date +%s|grep -o '....$'`
versionid="gen.v1.1 id538246738"
versionid="gen.v1.1 id364069021"

setrootdir

Expand Down
2 changes: 1 addition & 1 deletion gen/setupTermuxArch.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6e30cf3cde778a6b85174fada5e7ea418321bfa4bf7c0d5d62636afdfae517937424aec381214a550ce485f0ad971b8e8275092dc47153f444d95e675c268f0f setupTermuxArch.tar.gz
0040c259c6b1a3686d2a568009ee40fef061a236caa5aba5e4df26b5fa66cf4a079f81266d52795fac5c6771cde1f573bfe6857991c7696fdd51f4ccff810c10 setupTermuxArch.tar.gz
Binary file modified gen/setupTermuxArch.tar.gz
Binary file not shown.
23 changes: 21 additions & 2 deletions scripts/files/working/necessaryfunctions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ makefinishsetup ()
binfs=finishsetup.sh
cat > root/bin/$binfs <<- EOM
#!/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 this project.
################################################################################
EOM
if [ -e $HOME/.bash_profile ]; then
grep "proxy" $HOME/.bash_profile | grep "export" >> root/bin/$binfs 2>/dev/null ||:
Expand Down Expand Up @@ -186,6 +191,11 @@ makesetupbin ()
{
cat > root/bin/setupbin.sh <<- EOM
#!$PREFIX/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 this project.
################################################################################
unset LD_PRELOAD
EOM
if [[ "$kid" -eq 1 ]]; then
Expand All @@ -204,6 +214,11 @@ makestartbin ()
{
cat > $bin <<- EOM
#!$PREFIX/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 this project.
################################################################################
unset LD_PRELOAD
EOM
if [[ "$kid" -eq 1 ]]; then
Expand All @@ -212,13 +227,17 @@ makestartbin ()
EOM
else
cat >> $bin <<- EOM
if [[ \$1 = [Rr]* ]] || [[ \$1 = -[Rr]* ]] || [[ \$1 = --[Rr]* ]];then
if [[ \$1 = [Cc]* ]] || [[ \$1 = -[Cc]* ]] || [[ \$1 = --[Cc]* ]];then
exec proot --kill-on-exit --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 --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 --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 --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
fi
fi
chmod 700 $bin
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/files/working/setupTermuxArch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ dm=wget
dmverbose="-q"
#dmverbose="-v"
stime=`date +%s|grep -o '....$'`
versionid="gen.v1.1 id538246738"
versionid="gen.v1.1 id364069021"

setrootdir

Expand Down

0 comments on commit 9de720c

Please sign in to comment.