f$_& off

GNURootDebianSource/build.gradle

@@ -25,8 +25,8 @@ model {
     android.productFlavors {
         create("armel") {
             applicationId "com.gnuroot.debian"
-            versionName "0.6.11_armel"
-            versionCode 73
+            versionName "0.6.12_armel"
+            versionCode 76
             ndk.with {
                 abiFilters.add("armeabi")
             }
@@ -40,8 +40,8 @@ model {
         }
         create("armhf") {
             applicationId "com.gnuroot.debian"
-            versionName "0.6.11_armhf"
-            versionCode 74
+            versionName "0.6.12_armhf"
+            versionCode 77
             ndk.with {
                 abiFilters.add("armeabi-v7a")
             }
@@ -55,8 +55,8 @@ model {
         }
         create("i386") {
             applicationId "com.gnuroot.debian"
-            versionName "0.6.11_i386"
-            versionCode 75
+            versionName "0.6.12_i386"
+            versionCode 78
             ndk.with {
                 abiFilters.add("x86")
             }

GNURootDebianSource/src/armel/assets/WHERE_ARE_MY_FILES.txt

@@ -0,0 +1,13 @@
+In an effort to make GNURoot Debian more compatible with all
+Linux applications, we have moved your home directory from
+external to internal storage. External storage spaces often
+don't allow executables, and because of the way Android handles
+file permissions GNURoot can't perform a lot of it's nifty
+behind-the-scenes work in external storage either.
+
+That being said, you can reach the old home directory if you
+need to for any by navigating to
+
+/sdcard/GNURoot/home
+
+Thanks for your patience as we continue to perfect our app!

GNURootDebianSource/src/armel/assets/changeSSHPasswd.mp2

@@ -0,0 +1,2 @@
+#! /bin/bash
+echo user:$1 | sudo chpasswd

GNURootDebianSource/src/armel/assets/changeVNCPasswd.mp2

@@ -0,0 +1,20 @@
+#! /bin/bash
+rm /home/user/.vnc/passwd
+
+prog="/usr/bin/vncpasswd"
+pass=$1
+ans="n"
+
+/usr/bin/expect <<EOF
+spawn "$prog"
+expect "Password:"
+send "$pass\r"
+expect "Verify:"
+send "$pass\r"
+expect "Would you like to enter a view-only password (y/n)?"
+send "$ans\r"
+expect eof
+exit
+EOF
+
+exit

GNURootDebianSource/src/armel/assets/execInProot.replace.mp2

@@ -13,5 +13,23 @@ echo "  |_|  |___||_|  |__,||___||_  ||_|_||___|"
 echo "                           |___|          "
 echo -e "${NC}"
 
+#set path variables
+export PATH=$PATH:/usr/games
+export PATH=$PATH:/usr/local/games
+export PATH=$PATH:/bin
+export PATH=$PATH:/sbin
+export PATH=$PATH:/usr/bin
+export PATH=$PATH:/usr/sbin
+export PATH=$PATH:/usr/local/bin
+export PATH=$PATH:/usr/local/sbin
+
+#set environment variables
+export HOME="/home"
+export PS1="> "
+export TMPDIR="/tmp"
+export LD_LIBRARY_PATH=" "
+export LD_PRELOAD=" "
+export USER="root"
+
 #launch PRoot
-PROOT_TMP_DIR=ROOT_PATH/support/ ROOT_PATH/support/proot -r ROOT_PATH/debian -v -1 -p -H -0 -l -L -b /sys -b /dev -b /proc -b /data -b /mnt -b /proc/mounts:/etc/mtab -b /:/host-rootfs -b SDCARD_GNU_PATH/intents:/intents -b SDCARD_GNU_PATH/home:/home -b SDCARD_PATH:/sdcard -b ROOT_PATH/support/:/support -b ROOT_PATH/support/ld.so.preload:/etc/ld.so.preload EXTRA_BINDINGS $@
+PROOT_TMP_DIR=ROOT_PATH/support/ ROOT_PATH/support/proot -r ROOT_PATH/debian -v -1 -p -H -0 -l -L -b /sys -b /dev -b /proc -b /data -b /mnt -b /proc/mounts:/etc/mtab -b /:/host-rootfs -b SDCARD_GNU_PATH/intents:/intents -b SDCARD_PATH:/sdcard -b ROOT_PATH/support/:/support -b ROOT_PATH/support/ld.so.preload:/etc/ld.so.preload EXTRA_BINDINGS $@

GNURootDebianSource/src/armel/assets/installXPackages.replace.mp2

@@ -1,3 +1,3 @@
 #!/support/busybox sh
 
-/support/installPackages gnuroot_x_package libgl1-mesa-swx11 tightvncserver xterm xfonts-base twm
+/support/installPackages gnuroot_x_package libgl1-mesa-swx11 tightvncserver xterm xfonts-base twm expect

GNURootDebianSource/src/armel/assets/installXSupport.replace.mp2

@@ -1,3 +1,25 @@
-#!/support/busybox sh
+#!/bin/bash
 
-/support/untargz gnuroot_x_support /support/xsupport
+if [ ! -h /support/.gnuroot_x_support_passed ] && [ ! -e /support/.gnuroot_x_support_passed ]; then
+	echo "Installing xterm support..."
+	/support/busybox tar -xzvf /support/xsupport.tar.gz -C /home/user
+	if [[ $? == 0 ]]; then
+        touch /support/.gnuroot_x_support_passed
+    else
+        exit
+    fi
+fi
+
+if [ ! -h /support/.gnuroot_x_package_passed ] && [ ! -e /support/.gnuroot_x_package_passed ]; then
+	echo "Installing xterm packages..."
+	/support/installXPackages
+	if [ ! -f /support/.gnuroot_x_package_passed ]; then
+		exit
+	fi
+fi
+
+export DROPBEAR_PASSWORD="$1"
+shift
+/support/dbclient -y [email protected]/2022 /support/changeVNCPasswd $1
+
+exit

GNURootDebianSource/src/armel/assets/launchProot.replace.mp2

@@ -8,6 +8,18 @@ if [ ! -h ROOT_PATH/support/.gnuroot_rootfs_passed ] && [ ! -e ROOT_PATH/support
     if [ ! -f ROOT_PATH/support/.gnuroot_rootfs_passed ]; then
         exit
     fi
+    # During reinstallation, these files are moved outside the rootfs to preserve them
+    # but need to be moved back after the new rootfs has been installed, since /etc will
+    # otherwise be overwritten.
+    if [ -f ROOT_PATH/shadow ]; then
+        mv ROOT_PATH/shadow ROOT_PATH/debian/etc/shadow
+    fi
+    if [ -f ROOT_PATH/passwd ]; then
+            mv ROOT_PATH/passwd ROOT_PATH/debian/etc/passwd
+    fi
+    if [ -f ROOT_PATH/passwd- ]; then
+            mv ROOT_PATH/passwd- ROOT_PATH/debian/etc/passwd-
+    fi
 fi
 
 if [ ! -h ROOT_PATH/support/.gnuroot_patch_passed ] && [ ! -e ROOT_PATH/support/.gnuroot_patch_passed ]; then

GNURootDebianSource/src/armel/assets/launchXterm.replace.mp2

@@ -1,37 +1,6 @@
 #!ROOT_PATH/support/busybox sh
 
-ROOT_PATH/support/busybox clear
+DROPBEAR_PASSWORD=$1
+shift
 
-if [ ! -h ROOT_PATH/support/.gnuroot_rootfs_passed ] && [ ! -e ROOT_PATH/support/.gnuroot_rootfs_passed ]; then
-    echo "Installing new rootfs..."
-    ROOT_PATH/support/execInProot /support/installRootfs
-    if [ ! -f ROOT_PATH/support/.gnuroot_rootfs_passed ]; then
-        exit
-    fi
-fi
-
-if [ ! -h ROOT_PATH/support/.gnuroot_patch_passed ] && [ ! -e ROOT_PATH/support/.gnuroot_patch_passed ]; then
-    echo "Patching rootfs..."
-    ROOT_PATH/support/execInProot /support/patchRootfs
-    if [ ! -f ROOT_PATH/support/.gnuroot_patch_passed ]; then
-        exit
-    fi
-fi
-
-if [ ! -h ROOT_PATH/support/.gnuroot_x_support_passed ] && [ ! -e ROOT_PATH/support/.gnuroot_x_support_passed ]; then
-	echo "Installing xterm support..."
-	ROOT_PATH/support/execInProot /support/untargz gnuroot_x_support /support/xsupport.tar.gz
-	if [ ! -f ROOT_PATH/support/.gnuroot_x_support_passed ]; then
-		exit
-	fi
-fi
-
-if [ ! -h ROOT_PATH/support/.gnuroot_x_package_passed ] && [ ! -e ROOT_PATH/support/.gnuroot_x_package_passed ]; then
-	echo "Installing xterm packages..."
-	ROOT_PATH/support/execInProot /support/installXPackages
-	if [ ! -f ROOT_PATH/support/.gnuroot_x_package_passed ]; then
-		exit
-	fi
-fi
-
-ROOT_PATH/support/execInProot /support/startX $@
+ROOT_PATH/support/startDBClient $DROPBEAR_PASSWORD /support/startX $@

GNURootDebianSource/src/armel/assets/patchRootfs.replace.mp2

@@ -1,5 +1,8 @@
 #!/support/busybox sh
 
 #get rid of package installation for now
-#/support/installPackages gnuroot_patch sudo dropbear
-touch /support/.gnuroot_patch_passed
+# /support/installPackages gnuroot_patch sudo
+dpkg -i /support/sudo.deb
+if [ $? == 0 ]; then
+  touch /support/.gnuroot_patch_passed
+fi

GNURootDebianSource/src/armel/assets/startDBClient.replace.mp2

@@ -0,0 +1,14 @@
+#!ROOT_PATH/support/busybox sh
+
+export DROPBEAR_PASSWORD=$1
+shift
+
+# If we're starting X, it should be in the background, which means using the -t option will cause failure.
+if [ $1 == '/support/startX' ] || [ $1 == '/support/startVNCServer' ] || [ $1 == "button_pressed" ] || [ $1 == "background" ]; then
+    if [ $1 == "background" ]; then
+        shift
+    fi
+    ROOT_PATH/support/dbclient -y [email protected]/2022 "$@" 2> ROOT_PATH/support/.DBCErrX.txt
+else
+    ROOT_PATH/support/dbclient -yt [email protected]/2022 "$@" 2> ROOT_PATH/support/.DBCErr.txt
+fi

GNURootDebianSource/src/armel/assets/startDBServer.mp2

@@ -0,0 +1,25 @@
+#! /bin/bash
+
+if id "user" >/dev/null 2>&1; then
+    :
+else
+    groupadd -g 1500 user
+    useradd -m -u 1500 -g 1500 user
+    echo user:gnuroot | chpasswd
+    adduser user sudo
+fi
+
+if [ ! -d /etc/dropbear ]; then
+    mkdir /etc/dropbear
+fi
+
+if [ ! -f /etc/dropbear/dropbear_dss_host_key ]; then
+    /support/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key
+fi
+
+if [ ! -f /etc/dropbear/dropbear_rsa_host_key ]; then
+    /support/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+fi
+
+/support/dropbear &
+touch /support/.dropbear_running

GNURootDebianSource/src/armel/assets/startServers.replace.mp2

@@ -0,0 +1,40 @@
+#!ROOT_PATH/support/busybox sh
+
+DROPBEAR_PASSWORD=$1
+shift
+
+# Start a dropbear server if one isn't running
+if [[ "$1" == "dropbear" ]]; then
+    ps -ef | grep dropbear | grep -v "grep" | grep -v "startServer"
+    if [[ $? == 1 ]]; then
+        ROOT_PATH/support/launchProot /support/startDBServer
+    else
+        touch ROOT_PATH/support/.dropbear_running
+    fi
+
+    if [[ "$2" == "vnc" ]]; then
+        # start a VNC server through dropbear if both servers are to be started
+        while [ ! -f ROOT_PATH/support/.dropbear_running ]; do
+            sleep 1
+        done
+
+        ps -ef | grep Xtightvnc | grep -v "grep" | grep -v "startServer"
+        if [[ $? == 1 ]]; then
+            ROOT_PATH/support/startDBClient $DROPBEAR_PASSWORD /support/startVNCServer
+        else
+            touch ROOT_PATH/support/.vnc_running
+        fi
+    fi
+    # Exit once both have been started
+    exit
+fi
+
+# Start a vnc server if one isn't running, and dropbear isn't required
+if [[ "$1" == "vnc" ]]; then
+    ps -ef | grep Xtightvnc | grep -v "grep" | grep -v "startServer"
+    if [[ $? == 1 ]]; then
+        ROOT_PATH/support/execInProot /support/startVNCServer
+    else
+        touch ROOT_PATH/support/.vnc_running
+    fi
+fi

GNURootDebianSource/src/armel/assets/startVNCServer.mp2

@@ -0,0 +1,9 @@
+#! /bin/bash
+if [ ! -f /home/user/.vnc/passwd ]; then
+  tar -xzvf /support/xsupport.tar.gz -C /home/user/
+fi
+rm /tmp/.X51-lock
+rm /tmp/.X11-unix/X51
+HOME=/home/user tightvncserver -kill :51
+HOME=/home/user tightvncserver -geometry 1024x768 :51
+touch /support/.vnc_running

GNURootDebianSource/src/armel/assets/startX.mp2

@@ -2,30 +2,13 @@
 
 if [[ "$1" == "button_pressed" ]]; then
     shift
-    rm -f /support/.gnuroot_x_running
-    ps -a | grep xterm
+    rm /support/.gnuroot_x_running
+    ps -e | grep xterm
     if [[ $? == 0 ]]; then
         touch /support/.gnuroot_x_running
         rm -f /support/.gnuroot_x_started
         exit
     fi
 fi
 
-ps -a | grep Xtightvnc
-if [[ $? == 0 ]]; then
-    cp /root/.Xauthority /home/.Xauthority
-    DISPLAY=localhost:51 xterm -geometry 80x24+0+0 -e $@ &
-    blue='\033[0;34m'; NC='\033[0m'; echo -e "${blue}Killing this terminal will kill your xterm"
-    echo -e "${NC}"
-    touch /support/.gnuroot_x_started
-else
-    rm /tmp/.X51-lock
-    rm /tmp/.X11-unix/X51
-    HOME=/root tightvncserver -kill :51
-    HOME=/root tightvncserver -geometry 1024x768 :51
-    cp /root/.Xauthority /home/.Xauthority
-    DISPLAY=localhost:51 xterm -geometry 80x24+0+0 -e $@ &
-    blue='\033[0;34m'; NC='\033[0m'; echo -e "${blue}Killing this terminal will kill your vnc server and xterm"
-    echo -e "${NC}"
-    touch /support/.gnuroot_x_started
-fi
+DISPLAY=localhost:51 xterm -geometry 80x24+0+0 -e $@ &

GNURootDebianSource/src/armel/assets/untargz.replace.mp2

@@ -1,9 +1,9 @@
 #!/support/busybox sh
 
 if [ ! -f /host-rootfs/$2 ]; then
-    /support/busybox tar -xzvf $2
+    /support/busybox tar -xzvf $2 -C /
 else
-    /support/busybox tar -xzvf /host-rootfs/$2
+    /support/busybox tar -xzvf /host-rootfs/$2 -C /
 fi
 
 if [[ $? == 0 ]]; then 

GNURootDebianSource/src/armel/assets/waitForInstall.replace.mp2

@@ -0,0 +1,14 @@
+#! ROOT_PATH/support/busybox sh
+
+ROOT_PATH/support/busybox clear
+
+while [ ! -f ROOT_PATH/support/.dropbear_running ]; do
+    touch ROOT_PATH/support/.waiting
+    echo "Waiting for installation to complete..."
+    sleep 10
+done
+
+rm ROOT_PATH/support/.waiting
+
+# $1 is user password
+ROOT_PATH/support/startDBClient $1 /bin/bash

GNURootDebianSource/src/armhf/assets/WHERE_ARE_MY_FILES.txt

@@ -0,0 +1,13 @@
+In an effort to make GNURoot Debian more compatible with all
+Linux applications, we have moved your home directory from
+external to internal storage. External storage spaces often
+don't allow executables, and because of the way Android handles
+file permissions GNURoot can't perform a lot of it's nifty
+behind-the-scenes work in external storage either.
+
+That being said, you can reach the old home directory if you
+need to for any by navigating to
+
+/sdcard/GNURoot/home
+
+Thanks for your patience as we continue to perfect our app!

GNURootDebianSource/src/armhf/assets/changeSSHPasswd.mp2

@@ -0,0 +1,2 @@
+#! /bin/bash
+echo user:$1 | sudo chpasswd

GNURootDebianSource/src/armhf/assets/changeVNCPasswd.mp2

@@ -0,0 +1,20 @@
+#! /bin/bash
+rm /home/user/.vnc/passwd
+
+prog="/usr/bin/vncpasswd"
+pass=$1
+ans="n"
+
+/usr/bin/expect <<EOF
+spawn "$prog"
+expect "Password:"
+send "$pass\r"
+expect "Verify:"
+send "$pass\r"
+expect "Would you like to enter a view-only password (y/n)?"
+send "$ans\r"
+expect eof
+exit
+EOF
+
+exit