Merge pull request #28 from SaicharanKandukuri/modified

v02-patch-launchpad

Author: SaicharanKandukuri

README.md

@@ -1,31 +1,38 @@
-![Screenshot_20210605-115657_VNC Viewer](https://user-images.githubusercontent.com/68287637/120882449-b4729680-c5f5-11eb-8a47-c452aefcc882.jpg "A Screenshot of ubuntu xfce showing some pre-installed apps")
-<p align="center">
-    <img src="https://img.shields.io/badge/-Made%20with%20Bash-1f425f.svg?logo=image%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTExIDc5LjE1ODMyNSwgMjAxNS8wOS8xMC0wMToxMDoyMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE3MDg2QTAyQUZCMzExRTVBMkQxRDMzMkJDMUQ4RDk3IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE3MDg2QTAzQUZCMzExRTVBMkQxRDMzMkJDMUQ4RDk3Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QTcwODZBMDBBRkIzMTFFNUEyRDFEMzMyQkMxRDhEOTciIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QTcwODZBMDFBRkIzMTFFNUEyRDFEMzMyQkMxRDhEOTciLz4gPC9yZGY6RGVzY3JpcHRpb24%2BIDwvcmRmOlJERj4gPC94OnhtcG1ldGE%2BIDw%2FeHBhY2tldCBlbmQ9InIiPz6lm45hAAADkklEQVR42qyVa0yTVxzGn7d9Wy03MS2ii8s%2BeokYNQSVhCzOjXZOFNF4jx%2BMRmPUMEUEqVG36jo2thizLSQSMd4N8ZoQ8RKjJtooaCpK6ZoCtRXKpRempbTv5ey83bhkAUphz8fznvP8znn%2B%2F3NeEEJgNBoRRSmz0ub%2FfuxEacBg%2FDmYtiCjgo5NG2mBXq%2BH5I1ogMRk9Zbd%2BQU2e1ML6VPLOyf5tvBQ8yT1lG10imxsABm7SLs898GTpyYynEzP60hO3trHDKvMigUwdeaceacqzp7nOI4n0SSIIjl36ao4Z356OV07fSQAk6xJ3XGg%2BLCr1d1OYlVHp4eUHPnerU79ZA%2F1kuv1JQMAg%2BE4O2P23EumF3VkvHprsZKMzKwbRUXFEyTvSIEmTVbrysp%2BWr8wfQHGK6WChVa3bKUmdWou%2BjpArdGkzZ41c1zG%2Fu5uGH4swzd561F%2BuhIT4%2BLnSuPsv9%2BJKIpjNr9dXYOyk7%2FBZrcjIT4eCnoKgedJP4BEqhG77E3NKP31FO7cfQA5K0dSYuLgz2TwCWJSOBzG6crzKK%2BohNfni%2Bx6OMUMMNe%2Fgf7ocbw0v0acKg6J8Ql0q%2BT%2FAXR5PNi5dz9c71upuQqCKFAD%2BYhrZLEAmpodaHO3Qy6TI3NhBpbrshGtOWKOSMYwYGQM8nJzoFJNxP2HjyIQho4PewK6hBktoDcUwtIln4PjOWzflQ%2Be5yl0yCCYgYikTclGlxadio%2BBQCSiW1UXoVGrKYwH4RgMrjU1HAB4vR6LzWYfFUCKxfS8Ftk5qxHoCUQAUkRJaSEokkV6Y%2F%2BJUOC4hn6A39NVXVBYeNP8piH6HeA4fPbpdBQV5KOx0QaL1YppX3Jgk0TwH2Vg6S3u%2BdB91%2B%2FpuNYPYFl5uP5V7ZqvsrX7jxqMXR6ff3gCQSTzFI0a1TX3wIs8ul%2Bq4HuWAAiM39vhOuR1O1fQ2gT%2F26Z8Z5vrl2OHi9OXZn995nLV9aFfS6UC9JeJPfuK0NBohWpCHMSAAsFe74WWP%2BvT25wtP9Bpob6uGqqyDnOtaeumjRu%2ByFu36VntK%2FPA5umTJeUtPWZSU9BCgud661odVp3DZtkc7AnYR33RRC708PrVi1larW7XwZIjLnd7R6SgSqWSNjU1B3F72pz5TZbXmX5vV81Yb7Lg7XT%2FUXriu8XLVqw6c6XqWnBKiiYU%2BMt3wWF7u7i91XlSEITwSAZ%2FCzAAHsJVbwXYFFEAAAAASUVORK5CYII%3D">
-</p>
+![Screenshot_20210605-115657_VNC Viewer](src/images/edited_showcase.png "A Screenshot of ubuntu xfce showing some pre-installed apps")
 
-<p align="center">
-    <img src="https://badges.frapsoft.com/os/v1/open-source.svg?v=103">
-</p>
+| | |
+|--|--|
+|This project is | ![img](https://img.shields.io/badge/-Made%20with%20Bash-1f425f.svg?logo=image%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTExIDc5LjE1ODMyNSwgMjAxNS8wOS8xMC0wMToxMDoyMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE3MDg2QTAyQUZCMzExRTVBMkQxRDMzMkJDMUQ4RDk3IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE3MDg2QTAzQUZCMzExRTVBMkQxRDMzMkJDMUQ4RDk3Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QTcwODZBMDBBRkIzMTFFNUEyRDFEMzMyQkMxRDhEOTciIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QTcwODZBMDFBRkIzMTFFNUEyRDFEMzMyQkMxRDhEOTciLz4gPC9yZGY6RGVzY3JpcHRpb24%2BIDwvcmRmOlJERj4gPC94OnhtcG1ldGE%2BIDw%2FeHBhY2tldCBlbmQ9InIiPz6lm45hAAADkklEQVR42qyVa0yTVxzGn7d9Wy03MS2ii8s%2BeokYNQSVhCzOjXZOFNF4jx%2BMRmPUMEUEqVG36jo2thizLSQSMd4N8ZoQ8RKjJtooaCpK6ZoCtRXKpRempbTv5ey83bhkAUphz8fznvP8znn%2B%2F3NeEEJgNBoRRSmz0ub%2FfuxEacBg%2FDmYtiCjgo5NG2mBXq%2BH5I1ogMRk9Zbd%2BQU2e1ML6VPLOyf5tvBQ8yT1lG10imxsABm7SLs898GTpyYynEzP60hO3trHDKvMigUwdeaceacqzp7nOI4n0SSIIjl36ao4Z356OV07fSQAk6xJ3XGg%2BLCr1d1OYlVHp4eUHPnerU79ZA%2F1kuv1JQMAg%2BE4O2P23EumF3VkvHprsZKMzKwbRUXFEyTvSIEmTVbrysp%2BWr8wfQHGK6WChVa3bKUmdWou%2BjpArdGkzZ41c1zG%2Fu5uGH4swzd561F%2BuhIT4%2BLnSuPsv9%2BJKIpjNr9dXYOyk7%2FBZrcjIT4eCnoKgedJP4BEqhG77E3NKP31FO7cfQA5K0dSYuLgz2TwCWJSOBzG6crzKK%2BohNfni%2Bx6OMUMMNe%2Fgf7ocbw0v0acKg6J8Ql0q%2BT%2FAXR5PNi5dz9c71upuQqCKFAD%2BYhrZLEAmpodaHO3Qy6TI3NhBpbrshGtOWKOSMYwYGQM8nJzoFJNxP2HjyIQho4PewK6hBktoDcUwtIln4PjOWzflQ%2Be5yl0yCCYgYikTclGlxadio%2BBQCSiW1UXoVGrKYwH4RgMrjU1HAB4vR6LzWYfFUCKxfS8Ftk5qxHoCUQAUkRJaSEokkV6Y%2F%2BJUOC4hn6A39NVXVBYeNP8piH6HeA4fPbpdBQV5KOx0QaL1YppX3Jgk0TwH2Vg6S3u%2BdB91%2B%2FpuNYPYFl5uP5V7ZqvsrX7jxqMXR6ff3gCQSTzFI0a1TX3wIs8ul%2Bq4HuWAAiM39vhOuR1O1fQ2gT%2F26Z8Z5vrl2OHi9OXZn995nLV9aFfS6UC9JeJPfuK0NBohWpCHMSAAsFe74WWP%2BvT25wtP9Bpob6uGqqyDnOtaeumjRu%2ByFu36VntK%2FPA5umTJeUtPWZSU9BCgud661odVp3DZtkc7AnYR33RRC708PrVi1larW7XwZIjLnd7R6SgSqWSNjU1B3F72pz5TZbXmX5vV81Yb7Lg7XT%2FUXriu8XLVqw6c6XqWnBKiiYU%2BMt3wWF7u7i91XlSEITwSAZ%2FCzAAHsJVbwXYFFEAAAAASUVORK5CYII%3D) ![img2](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)|
+|status| ![img3](https://img.shields.io/badge/On-Upgrade%20to%20v01-green) |
+|Platform | **Android Termux App (proot `prtace()` )**|
+| Linux Distribution | ![badge3](https://img.shields.io/badge/Linux%20Distribution-UBUNTU%20Hippo%2021.04-brightgreen) |
+|Community | [![Support Server](https://img.shields.io/discord/851345998831157288.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/y432PhPYCS) [![Join the chat at https://gitter.im/ubuntu-on-android/community](https://badges.gitter.im/ubuntu-on-android/community.svg)](https://gitter.im/ubuntu-on-android/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) |
 
-![stage](https://img.shields.io/badge/Status-Installable-green) ![badge2](https://img.shields.io/badge/App-Termux-green) ![badge3](https://img.shields.io/badge/Linux%20Distribution-UBUNTU-brightgreen) ![bagge4](https://img.shields.io/badge/Linux%20Distribution__version-21.04%20(hippo)-brightgreen)
-[![Support Server](https://img.shields.io/discord/851345998831157288.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/y432PhPYCS) [![Join the chat at https://gitter.im/ubuntu-on-android/community](https://badges.gitter.im/ubuntu-on-android/community.svg)](https://gitter.im/ubuntu-on-android/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 <h1 align="Center">Ubuntu 21.04 On android</h1>
 A tweaked ubuntu-21.04 with xfce4 runs on android with termux/proot-distro
 
 > This means now you can install ubuntu like above screenshot right in your smartphone without destroying your phone with rooting
-> (let android and google live)
 
 - codename -> `hippo`
 
-### A note before you try
+<details>
+  <summary>Note & Disclaimer</summary>
+
+A note before you try
 - As lot of it is preinstalled you can login and start right after you install 
 - As this runs on termux so performence clearly depends on CPU, ram and storage read-write speed!
 - Don't try heavy apps unless you have a good device :)
-- And its in early stages of building so some things may look kind of bad or missing(make sure to notice me if you find any in issues)
 - If you have any issues or suggestions make sure i know at https://github.com/RandomCoderOrg/ubuntu-on-android/issue (create an issue)
 
+> **Disclaimer** : 
+- i dont work with any company or organization of ubuntu or any third party sources took in making fs(for now).
+- This project works by compliying to selinux android. and all aim of the project is just run linux on android without direct root with a twist and improves time by time.
+- the linux you trying to install from this repo is not fully functional in target space because of the selinux policies, increasing requirement in linux requirements and also because project is set to run with `ptrace()`
+- This project comes without warranties or data protection
+</details>
+
 # Installation
 - First install termux from [termux.com](https://termux.com) or [F-Droid!](https://f-droid.org/en/packages/com.termux/)
 
@@ -34,69 +41,66 @@ A tweaked ubuntu-21.04 with xfce4 runs on android with termux/proot-distro
 # remove ubuntu-on-android folder if exists
 rm -rf ubuntu-on-android
 # install dependencies
-apt update; apt upgrade -y ; apt install -y pulseaudio proot-distro git -y
+apt update; apt upgrade -y ; apt install git -y
 # clone the code
 git clone https://github.com/RandomCoderOrg/ubuntu-on-android
 # run the installer
 cd ubuntu-on-android
 bash install.sh
-# install
-proot-distro install hippo
+# start the manager for first time (if it can't find any pre-installed fs it automatiaclly starts installing it)
+hippo
 ```
-### Logging into hippo
-```bash
-# run
-proot-distro login hippo
-```
-### starting vncserver
+### Basic Usage
+  | **Command**        | **Usage** |
+  |--------------------|-----------|
+  | `hippo`            | To login to shell |
+  | `hippo startvnc`   | start vncserver at port `1` (Tou can change default port by exporting env varaible `` to a port number) |
+  | `hippo stopvnc`    | stop vncserver at given or default port `1`
+  |  `hippo upgrade` | to upgrade fs or to get new features if avalibe |
 
-```bash
-vncserver-start
-```
-This step start GUI like screenshot above
-it requires an app to see, its up to yourchoice but here are some recommended apps
-- [RealVnc](https://play.google.com/store/apps/details?id=com.realvnc.viewer.android&hl=en_IN&gl=US)(recommended) avalible in playstore
-- [Nethunter KEX](https://store.nethunter.com/en/packages/com.offsec.nethunter.kex/) 
-### stoping vncserver
-```bash
-vncserver --kill :1
-```
-> If you press `logout` button inside vnc no need to do this step
-### Logout from hippo :)
-```bash
-exit
-```
 
 ## 🔊  Audio 
-Just execute `pulseserver-start` in termux and audio will get setup automatically.:)
-
-Or.
+for some reasons we imported this step to hippo that mean audio automatically enabled when you invoked any start commands of `hippo`
 
+> You can also audio manually with this command
 ```bash
 pulseaudio --start --load="module-native-protocol-tcp auth-ip-acl=127.0.0.1 auth-anonymous=1" --exit-idle-time=-1
 ```
 ## Default passwords
-`user` -> root
 
+|  |password|
+|--|--------|
+| hippo user | `secret` |
+|vncserver root | `secret` |
+
+## some Screenshots
 
+![imaage](src/images/six.png)
 
-vnc password -> `ubuntu`
+![imaage](src/images/five.png)
 
+![imaage](src/images/four.png)
 
-you can change it by command `vncpasswd`
+![imaage](src/images/three.png)
 
-## Appeared on
-- Youtube (1x1 Tech channel): https://www.youtube.com/watch?v=aJhV7K80OvQ
-[![IMAGE ALT TEXT HERE](https://img.youtube.com/vi/aJhV7K80OvQ/0.jpg)](https://www.youtube.com/watch?v=aJhV7K80OvQ)
+![imaage](src/images/two.png)
+
+![imaage](src/images/one.png)
 
 A small help from me if you want to build your own rootfs [wiki_page](https://github.com/RandomCoderOrg/ubuntu-on-android/wiki/commands-took-to-make-a-custom-rootfs)
+
 # Devolopers & credits
 Made with ❤️ from:
+
 DEV #0 -> [Saicharankandukuri](https://github.com/SaicharanKandukuri)
 
+Dev #1 -> [Gxmersam](https://github.com/GxmerSam)
+
 # Links to community
 - create an [issue](https://github.com/RandomCoderOrg/ubuntu-on-android/issues) if you want to make me create one!
 
-<h2 align="center"> More Updates coming soon 💛<h2>
+
+
+<h2 align="center"> More Updates coming soon 💛</h2>
 
 - feel free to contribute to this repo :)

install.sh

@@ -1,45 +1,79 @@
 #!/usr/bin/env bash
 
-####################################
-# A Script to implant hippo inside 
-# proot-distro(for now!)
+##############
+# Script V01
 #
-TERMUX_PREFIX="/data/data/com.termux/files"
-DISTRO_PLUGINS_DIR="${TERMUX_PREFIX}/usr/etc/proot-distro"
 
-function _implant_()
+
+CACHE_ROOT="${HOME}/.uoa-cache-root"
+TPREFIX="/data/data/com.termux/files"
+BIN_DIR="${TPREFIX}/usr/bin"
+INSTALL_FOLDER="${TPREFIX}/usr/var/lib/proot-distro/installed-rootfs"
+HIPPO_DIR="${INSTALL_FOLDER}/hippo"
+SCRIPT_DIR="${TPREFIX}/usr/etc/proot-distro/"
+HIPPO_REPO_URL="https://github.com/RandomCoderOrg/ubuntu-on-android"
+FSM_URL="https://github.com/RandomCoderOrg/fs-manager-hippo"
+
+die   () { echo -e "\e[1;32m Error ${*}\e[0m";exit 1 ;:;}
+shout () { echo -e "${*}\e[0m";:; }
+
+function setup_and_clone()
 {
-    if [ -f hippo.sh ]; then
-        if ! [ -f "${DISTRO_PLUGINS_DIR}"/hippo.sh ]; then
-            cp -v hippo.sh "${DISTRO_PLUGINS_DIR}"
-            echo -e "Implant done......."
-            echo -e "- Now you can install ubuntu by running \e[1;32mproot-distro install hippo\e[0m"
-        else
-            echo "Looks like \"hippo\" is already installed..."
-            echo -e "you can install ubuntu by running \e[1;32mproot-distro install hippo\e[0m"
-            echo -e "you can login to ubuntu by running \e[1;32mproot-distro login hippo\e[0m" 
-        
-        fi
-        return 0
-    else
-        return 1
+    shout "Trying to update apt indexes...."
+    apt update; apt upgrade -y
+
+    if ! command -v git >> /dev/null; then
+    shout "Installing git.."
+        apt install git -y || {
+            die "Git installation failed"
+        }
+    fi
+
+    if ! command -v pulseaudio >> /dev/null; then
+    shout "Installing pulseaudio..."
+        apt install pulseaudio -y || {
+            die "pulseaudio installation failed"
+        }
     fi
+    
+    if ! command -v pv >> /dev/null; then
+    shout "installing pv.."
+        apt install pv -y
+    fi
+
+    git clone ${HIPPO_REPO_URL} "${CACHE_ROOT}/ubuntu-on-android" || die "failed to clone repo"
+    git clone ${FSM_URL} "${CACHE_ROOT}/fs-manager-hippo" || die "failed to clone repo"
+
+    install
 }
-############################
-#
-# REQUIREMENTS
-
-apt update; apt upgrade -y
-
-if ! command -v proot-distro; then
-    apt install proot-distro -y
-fi
-if ! command -v pulseaudio; then
-    apt install pulseaudio -y
-    pulseaudio --start --load="module-native-protocol-tcp auth-ip-acl=127.0.0.1 auth-anonymous=1" --exit-idle-time=-1
-fi
-
-########################
-if ! _implant_; then # this wont happen (mostly)
-    echo ":( \e[32m error...\e[0m Please create a issue at \e[1;32mhttps://github.com/SaicharanKandukuri/ubuntu-on-android/issues\e[0m to resolve "
-fi
+
+function install()
+{
+    ####
+    # Step 1
+
+    shout "setting up implant..."
+
+    if [ -f "${CACHE_ROOT}"/ubuntu-on-android/hippo.sh ]; then
+        cp "${CACHE_ROOT}"/ubuntu-on-android/hippo.sh ${SCRIPT_DIR}
+    fi
+
+    ####
+    # step 2
+
+    if [ -f "${CACHE_ROOT}"/fs-manager-hippo/install.sh ]; then
+        cd "${CACHE_ROOT}"/fs-manager-hippo || die "failed to cd ..."
+        bash install.sh || die "failed to install manager..."
+    fi
+
+    shout
+    shout "setup complete..."
+    shout "Now you can install and login with comand\e[1;32hippo"
+    shout "for info use hippo --help"
+    shout
+
+    exit 1
+
+}
+
+setup_and_clone