Skip to content

Commit

Permalink
Commit on 20180308 branch master 008580809
Browse files Browse the repository at this point in the history
  • Loading branch information
SDRausty committed Mar 9, 2018
1 parent b0eb960 commit fd09f37
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
9 changes: 5 additions & 4 deletions gen/setupTermuxArch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ edq2 ()
{
while true; do
if [[ $opt = bloom ]] || [[ $opt = manual ]];then
printf "\nWould you like to use \`\033[1;32mnano\033[0;32m\` or \`\033[1;32mvi\033[0;32m\` to edit \`\033[1;32msetupTermuxArchConfigs.sh\033[0;32m\`? "
printf "\033[1;34m Would you like to use \033[1;32mnano\033[1;34m or \033[1;32mvi\033[1;34m to edit \033[1;32msetupTermuxArchConfigs.sh\033[1;34m? "
read -p "Answer nano or vi [n|V]? " nv
else
printf "\nChange the worldwide mirror to a mirror that is geographically nearby. Choose only ONE active mirror in the mirrors file that you are about to edit. Would you like to use \`\033[1;32mnano\033[0;32m\` or \`\033[1;32mvi\033[0;32m\` to edit the Arch Linux configuration files? "
printf "\033[1;34m Change the worldwide mirror to a mirror that is geographically nearby. Choose only ONE active mirror in the mirrors file that you are about to edit. Would you like to use \033[1;32mnano\033[1;34m or \033[1;32mvi\033[1;34m to edit the Arch Linux configuration files? "
read -p "Answer nano or vi [n|V]? " nv
fi
if [[ $nv = [Nn]* ]];then
Expand All @@ -247,14 +247,15 @@ edq2 ()
printf "\nYou answered \033[36;1m$nv\033[1;32m.\n\nAnswer nano or vi [n|v]. \n"
fi
done
printf "\n\n"
}

intro ()
{
# rmarchq
rootdirexception
spaceinfoq
printf "\n\033[0;34m 🕛 > 🕛 \033[1;34msetupTermuxArch $versionid will attempt to install Linux in \033[0;32m$HOME$rootdir\033[1;34m. Arch Linux will be available upon successful completion. Ensure background data is not restricted. Check the wireless connection if you do not see one o'clock 🕐 below. "
printf "\n\033[0;34m 🕛 > 🕛 \033[1;34msetupTermuxArch $versionid will attempt to install Linux in \033[1;32m$HOME$rootdir\033[1;34m. Arch Linux will be available upon successful completion. Ensure background data is not restricted. Check the wireless connection if you do not see one o'clock 🕐 below. "
dependsblock
}

Expand Down Expand Up @@ -644,7 +645,7 @@ dm=wget
dmverbose="-q"
#dmverbose="-v"
stime=`date +%s|grep -o '....$'`
versionid="gen.v1.1 id552198592"
versionid="gen.v1.1 id008580809"

setrootdir

Expand Down
2 changes: 1 addition & 1 deletion gen/setupTermuxArch.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5db18d3899ff9244fa3d8d017932e484d5eb7cd1c3a5a8ae20619a80c9eb4473413f3859a4a6088a9b098d5da2979b10012fb155e7955e7043e1d62f013c4608 setupTermuxArch.tar.gz
b5386d1929e0ca2b7f882732e24c5103a8bf5178fa5ccdaa6cb1babea07b08950324406c7100a9538ae948991d8d735b4d631694265f87f15437e7ebdf646743 setupTermuxArch.tar.gz
Binary file modified gen/setupTermuxArch.tar.gz
Binary file not shown.
4 changes: 4 additions & 0 deletions scripts/files/working/necessaryfunctions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,11 @@ makestartbin ()
EOM
else
cat >> $bin <<- EOM
if [[ $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/\$@ --login ||:
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
chmod 700 $bin
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="v1.1"
versionid="gen.v1.1 id008580809"

setrootdir

Expand Down

0 comments on commit fd09f37

Please sign in to comment.