Commit on 20180418 branch master 493133243

SDRausty · Apr 18, 2018 · b99ac3c · b99ac3c
1 parent a431bf3
commit b99ac3c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/necessaryfunctions.sh b/necessaryfunctions.sh
@@ -284,9 +284,10 @@ preproot () {
 			#cd $HOME
 			#proot --link2symlink -0 $PREFIX/bin/applets/tar xf $installdir$file 
 			#cd $installdir
-			 proot --link2symlink -0 bsdtar -xpf $file --strip-components 1 
+			proot --link2symlink -0 bsdtar -xpf $file --strip-components 1 
 		else
-			 proot --link2symlink -0 $PREFIX/bin/applets/tar xf $file 
+			#proot --link2symlink -0 $PREFIX/bin/applets/tar xf $file 
+			proot --link2symlink -0 bsdtar -xpf $file --strip-components 1 
 		fi
 	else
 		printf "\n\n\033[1;31mDownload Exception!  Execute \033[0;32mbash setupTermuxArch.sh\033[1;31m again…\n"'\033]2;  Thank you for using setupTermuxArch.sh.  Execute `bash setupTermuxArch.sh` again…\007'

diff --git a/scripts/files/stable/necessaryfunctions.sh b/scripts/files/stable/necessaryfunctions.sh
@@ -284,9 +284,10 @@ preproot () {
 			#cd $HOME
 			#proot --link2symlink -0 $PREFIX/bin/applets/tar xf $installdir$file 
 			#cd $installdir
-			 proot --link2symlink -0 bsdtar -xpf $file --strip-components 1 
+			proot --link2symlink -0 bsdtar -xpf $file --strip-components 1 
 		else
-			 proot --link2symlink -0 $PREFIX/bin/applets/tar xf $file 
+			#proot --link2symlink -0 $PREFIX/bin/applets/tar xf $file 
+			proot --link2symlink -0 bsdtar -xpf $file --strip-components 1 
 		fi
 	else
 		printf "\n\n\033[1;31mDownload Exception!  Execute \033[0;32mbash setupTermuxArch.sh\033[1;31m again…\n"'\033]2;  Thank you for using setupTermuxArch.sh.  Execute `bash setupTermuxArch.sh` again…\007'

diff --git a/scripts/files/stable/setupTermuxArch.sh b/scripts/files/stable/setupTermuxArch.sh
@@ -185,6 +185,7 @@ dependbp () {
 		prootif 
 	else
 		prootif 
+		bsdtarif 
 	fi
 }
 
@@ -727,3 +728,4 @@ else
 	printusage
 fi
 printtail 
+
diff --git a/scripts/files/working/setupTermuxArch.sh b/scripts/files/working/setupTermuxArch.sh
@@ -649,13 +649,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 id861910287"
+versionid="v1.6"
 
 if [[ $commandif = "" ]];then
 	echo Run \`setupTermuxArch.sh\` from the Android system in Termux.

diff --git a/setupTermuxArch.sh b/setupTermuxArch.sh
@@ -185,6 +185,7 @@ dependbp () {
 		prootif 
 	else
 		prootif 
+		bsdtarif 
 	fi
 }
 
@@ -727,3 +728,4 @@ else
 	printusage
 fi
 printtail 
+
diff --git a/setupTermuxArch.sha512 b/setupTermuxArch.sha512
@@ -1 +1 @@
-0890a8b12cb579c73cee5f15df6c56aaa199b38878bedea7100123bbee081f4986a3a3207e9293391ae8007ecea932076ddcf632920690b85f45aadf16949cd2  setupTermuxArch.tar.gz
+15be3129b67657814b48e3f41bdd9fca576b713dac4adb79632fc4848a5dbe629fcbd88f8248403f4b58a3af6fada7e83c460fed7981e230afd068bbcf36aaf4  setupTermuxArch.tar.gz
diff --git a/setupTermuxArch.tar.gz b/setupTermuxArch.tar.gz
-Original file line number
+Diff line change
@@ Expand Up / @@ -185,6 +185,7 @@ dependbp () { @@
     		prootif
     	else
     		prootif
+    		bsdtarif
     	fi
     }
@@ Expand Down Expand Up / @@ -727,3 +728,4 @@ else @@
     	printusage
     fi
     printtail
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0890a8b12cb579c73cee5f15df6c56aaa199b38878bedea7100123bbee081f4986a3a3207e9293391ae8007ecea932076ddcf632920690b85f45aadf16949cd2 setupTermuxArch.tar.gz
		15be3129b67657814b48e3f41bdd9fca576b713dac4adb79632fc4848a5dbe629fcbd88f8248403f4b58a3af6fada7e83c460fed7981e230afd068bbcf36aaf4 setupTermuxArch.tar.gz