Merge pull request #11 from RandomCoderOrg/SaicharanKandukuri/issue9

fix #9

Author: SaicharanKandukuri

etc/proot-env/vnc/xstartup

@@ -2,4 +2,8 @@
 unset SESSION_MANAGER
 unset DBUS_SESSION_BUS_ADDRESS
 export PULSE_SERVER=127.0.0.1
-dbus-launch --exit-with-session startxfce4
+dbus-launch --exit-with-session startxfce4 &
+
+if command -v plank > /dev/null; then
+  plank &
+fi

etc/proot-env/vnc/xstartup-hdpi

@@ -5,4 +5,8 @@ export PULSE_SERVER=127.0.0.1
 export GDK_SCALE=2
 export XCURSOR_SIZE=48
 export QT_SCALE_FACTOR=2
-dbus-lauch --exit-with-session startxfce4
+dbus-lauch --exit-with-session startxfce4 &
+
+if command -v plank > /dev/null; then
+  plank &
+fi

etc/scripts/pulseeffects/install.sh

@@ -14,10 +14,10 @@
 # shout()   pring messege in a good way with some lines
 # lshout()  print messege in a standard way
 
-die    () { echo -e "${RED}Error ${*}${RST}";exit 1 ;:;}
-warn   () { echo -e "${RED}Error ${*}${RST}";:;}
-shout  () { echo -e "${DC}-----";echo -e "${*}";echo -e "-----${RST}";:; }
-lshout () { echo -e "${DC}";echo -e "${*}";echo -e "${RST}";:; }
+die    () { echo -e "${RED}!! ${*}${RST}";exit 1 ;:;}
+warn   () { echo -e "${RED}?? ${*}${RST}";:;}
+shout  () { echo -e "${DS}=> ${*}${RST}";:; }
+lshout () { echo -e "${DC}-> ${*}${RST}";:; }
 
 ###################################################################
 # 1. Update apt indexs

etc/scripts/udroid/udroid-proot.sh

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+# Udroid manager to work inside proot environment
+#
+
+_init()
+{
+    : 
+}
+######
+_set()
+{
+    :
+}
+
+_enable()
+{
+    :
+}
+
+_start()
+{
+    :
+}
+
+_createuser()
+{
+    :
+}
+######
+
+_start_vnc()
+{
+    :
+}
+
+_stop_vnc()
+{
+    :
+}
+
+######
+
+_start_services()
+{
+    :
+}
+
+_stop_services()
+{
+    :
+}
+
+######

etc/scripts/udroid/udroid.sh

@@ -11,6 +11,7 @@ TPREFIX="/data/data/com.termux/files"
 
 SCRIPT_DIR="${TPREFIX}/usr/etc/proot-distro"
 INSTALL_FOLDER="${TPREFIX}/usr/var/lib/proot-distro/installed-rootfs"
+DLCACHE="${PREFIX}/usr/var/lib/proot-distro/dlcache"
 
 HIPPO_DIR="${INSTALL_FOLDER}/udroid"
 HIPPO_SCRIPT_FILE="${SCRIPT_DIR}/udroid.sh"
@@ -27,10 +28,10 @@ HIPPO_SCRIPT_FILE="${SCRIPT_DIR}/udroid.sh"
 # lshout()  print messege in a standard way
 # msg()     print's normal echo
 
-die    () { echo -e "${RED}Error ${*}${RST}";exit 1 ;:;}
-warn   () { echo -e "${RED}Error ${*}${RST}";:;}
-shout  () { echo -e "${DS}////////";echo -e "${*}";echo -e "////////${RST}";:; }
-lshout () { echo -e "${DC}";echo -e "${*}";echo -e "${RST}";:; }
+die    () { echo -e "${RED}!! ${*}${RST}";exit 1 ;:;}
+warn   () { echo -e "${RED}?? ${*}${RST}";:;}
+shout  () { echo -e "${DS}=> ${*}${RST}";:; }
+lshout () { echo -e "${DC}-> ${*}${RST}";:; }
 msg    () { echo -e "\e[38;5;228m ${*} \e[0m" >&2 ;:; }
 
 
@@ -43,7 +44,7 @@ function __check_for_hippo() {
 }
 
 function __check_for_plugin() {
-    
+
     if [ -f ${HIPPO_SCRIPT_FILE} ]; then
         return 0
     else
@@ -65,12 +66,14 @@ function __verify_bin_path()
 {
     BINPATH="${SHELL}"
 
-    if [ -z "$BINPATH" ]; then
+    if [ -n "$BINPATH" ]; then
         if [ "$BINPATH" != "/data/data/com.termux/files/*" ]; then
             msg "This has to be done inside termux environment"
             die "\$SHELL != $BINPATH"
             exit 1
         fi
+    else
+        warn "SHELL value is empty.."
     fi
 }
 
@@ -143,15 +146,41 @@ function __force_uprade_hippo()
         bash install.sh || die "failed to install manager..."
     fi
 }
-
+progressfilt ()
+{
+    local flag=false c count cr=$'\r' nl=$'\n'
+    while IFS='' read -d '' -rn 1 c
+    do
+        if $flag
+        then
+            printf '%s' "$c"
+        else
+            if [[ $c != $cr && $c != $nl ]]
+            then
+                count=0
+            else
+                ((count++))
+                if ((count > 1))
+                then
+                    flag=true
+                fi
+            fi
+        fi
+    done
+}
+_download ()
+{
+  link=$1
+  wget --progress=bar:force $link || die "download failed"
+}
 function __help()
 {
     msg "udroid - termux Version ${version} by saicharankandukuri"
-    msg 
+    msg
     msg "A bash script to make basic action(login, vncserver) easier for ubuntu-on-android project"
-    msg 
+    msg
     msg "Usage ${0} [options]"
-    msg 
+    msg
     msg "Options:"
     msg "--install       To try installing udroid"
     msg "--help          To display this message"
@@ -162,13 +191,55 @@ function __help()
     msg "--enable-dbus-startvnc To start vnc with dbus"
     msg "------------------"#links goes here
     msg "for additional documentation see: \e[1;34mhttps://github.com/RandomCoderOrg/ubuntu-on-android#basic-usage"
-    msg "report issues and feature requests at: \e[1;34mhttps://github.com/RandomCoderOrg/ubuntu-on-android/issues"  
+    msg "report issues and feature requests at: \e[1;34mhttps://github.com/RandomCoderOrg/ubuntu-on-android/issues"
     # msg "Join the community at DISCORD -> $SOCIAL_PLATFORM"
     msg "------------------"
 }
 
+function __split_tarball_handler()
+{
+  target_plugin=$1
+  if [ -n "$target_plugin" ] && [ -f "$target_plugin" ]; then
+    source $target_plugin
+  else
+    die "Could not find script in tmp directory: This attribute is not for manuall entry"
+  fi
+
+  if ! $SPLIT_TARBALL_FS; then
+    cp "$target_plugin" "$SCRIPT_DIR/udroid.sh"
+    shift; _lauch_or_install "$@"
+  fi
+  shout "starting download.. this may take some time"
+
+  if [ ! -d ${CACHE_ROOT} ]; then
+    mkdir -v ${CACHE_ROOT}
+  fi
+
+  mkdir -p "${CACHE_ROOT}/fs-cache"
+
+  # count no.of parts
+  x=0
+  for part in $PARTS; do
+    ((x=x+1))
+  done
+  cd ${CACHE_ROOT}/fs-cache || die "failed.. cd"
+  # start download
+  y=0
+  for links in $PARTS; do
+    ((y=y+1))
+    shout "downloading [$(basename $links)] part($y/$x).. "
+    _download $links
+  done
+  cd $HOME || die "failed.. cd"
+  shout "combining parts to one.. （￣︶￣）↗"
+  cat "${CACHE_ROOT}/fs-cache/*" > "${DLCACHE}/${FINAL_NAME}"
+  shout "triggering installation.."
+  shift ; _lauch_or_install "$@"
+}
+
 function _lauch_or_install()
 {
+
     if ! __check_for_plugin; then
         echo -e "Plugin at ${HIPPO_SCRIPT_FILE} is missing ......"
         echo -e "May be this not a correct installation...."
@@ -208,7 +279,7 @@ __verify_bin_path
 if [ $# -ge 1 ]; then
     case "$1" in
         upgrade) __upgrade;;
-        
+        --init-setup-tarball) shift 1; __split_tarball_handler "$@";;
         --force-upgrade) __force_uprade_hippo;;
         --enable-dbus) shift 1; _lauch_or_install --bind /dev/null:/proc/sys/kernel/cap_last_cap "$@" ;;
         "--enable-dbus-startvnc") shift 1; _lauch_or_install --bind /dev/null:/proc/sys/kernel/cap_last_cap -- startvnc "$@" ;;
@@ -225,7 +296,7 @@ if [ $# -ge 1 ]; then
             echo -e "\e[32mError:\e[0m udroid not found"
         fi
         ;;
-        
+
         stoptvnc)
         if __check_for_hippo; then
             proot-distro login udroid --no-kill-on-exit -- stoptvnc

etc/scripts/vncserver/startvnc.sh

@@ -19,15 +19,18 @@ fi
 
 if [ -f /tmp/.X11-unix/X${port} ]; then
     vnc=true
-elif [ -f /tmp/.X${port}-lock ]; then
-    vnc=true
 else
     vnc=false
 fi
 
+if [ -f /tmp/.X${port}-lock ]; then
+    vnc=true
+else
+    vnc=false
+fi
 
 if ! $vnc; then
-    vncserver -xstartup "${DEFAULT_XSTARTUP}" -desktop "udroid Default VNC" :${port}
+    vncserver -xstartup "${DEFAULT_XSTARTUP}" -localhost no -desktop "udroid Default VNC" :${port}
 else
     echo "A vncserver lock is found for port ${port}"
     echo -e "Use \e[1;32mudroid stoptvnc\e[0m or \e[1;32mstopvnc\e[0m to stop it and try again..."