Merge pull request #30 from RandomCoderOrg/fix01-patch

Fix01 patch

Author: SaicharanKandukuri

README.md

@@ -40,17 +40,12 @@ A note before you try
 
 ## Getting Sources and install scripts
 ```bash
-# remove ubuntu-on-android folder if exists
-rm -rf ubuntu-on-android
-# install dependencies
-apt update; apt upgrade -y ; apt install git -y
-# clone the code
-git clone https://github.com/RandomCoderOrg/ubuntu-on-android
+# download installer
+curl -L -o install.sh https://git.io/hippo-installer
 # run the installer
-cd ubuntu-on-android
 bash install.sh
-# start the manager for first time (if it can't find any pre-installed fs it automatiaclly starts installing it)
-hippo
+# Install ubuntu with this command
+hippo --install
 ```
 ### Basic Usage
   | **Command**        | **Usage** |

install.sh

@@ -4,22 +4,44 @@
 # * Script V01
 #
 
+version="01"
+
+# * Deafault color is Blue
+RST="\e[0m"
+RED="\e[1;31m" # *This is bold 
+GREEN="\e[1;32m"
+BLUE="\e[34m"
+DC=${BLUE}
+
+#GREEN_THIN="\e[32m"
+
+# * Used for testing
+if [ -n "$HIPPO_BRANCH" ]; then
+    BRANCH="$HIPPO_BRANCH"
+fi
+
 
 CACHE_ROOT="${HOME}/.uoa-cache-root"
 TPREFIX="/data/data/com.termux/files"
-BIN_DIR="${TPREFIX}/usr/bin"
+#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/"
+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";:; }
+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}";:; }
+
+
+shout "\e[1;32m Hippo Installer v${version}"
+sleep 2
 
 #
 # * die function exits program
-# * shout just echo the messege out
+# * shout just echo the messege out (fancy one line 😁)
 #
 
 function setup_and_clone()
@@ -32,22 +54,37 @@ function setup_and_clone()
         apt install git -y || {
             die "Git installation failed"
         }
+        lshout "Done..."
     fi
 
     if ! command -v pulseaudio >> /dev/null; then
     shout "Installing pulseaudio..."
         apt install pulseaudio -y || {
             die "pulseaudio installation failed"
         }
+        lshout "Done..."
     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"
+    if [ -d "${CACHE_ROOT}" ]; then
+        shout "Removing old cache......."
+        rm -rf "${CACHE_ROOT:?}/"*
+        lshout "Done..."
+    fi
+
+    shout "Cloning code from Github........."
+    if [ -n "${BRANCH}" ]; then
+        git clone -b "${BRANCH}" ${HIPPO_REPO_URL} "${CACHE_ROOT}/ubuntu-on-android" || die "failed to clone repo"
+        git clone -b "${BRANCH}" ${FSM_URL} "${CACHE_ROOT}/fs-manager-hippo" || die "failed to clone repo"
+    else
+        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"
+    fi
+    lshout "Done..."
 
     install
 }
@@ -57,7 +94,13 @@ function install()
     ####
     # * Step 1
 
-    shout "setting up implant..."
+    shout "setting up proot-distro hippo implant..."
+
+    sleep 3
+    
+    if [ -f ${SCRIPT_DIR} ]; then
+        mv ${SCRIPT_DIR} "${SCRIPT_DIR}1"
+    fi
 
     if [ -f "${CACHE_ROOT}"/ubuntu-on-android/hippo.sh ]; then
         cp "${CACHE_ROOT}"/ubuntu-on-android/hippo.sh ${SCRIPT_DIR}
@@ -70,15 +113,11 @@ function install()
         oldpwd="$(pwd)"
         cd "${CACHE_ROOT}"/fs-manager-hippo || die "failed to cd ..."
         bash install.sh || die "failed to install manager..."
-        cd "${oldpwd}"
+        cd "${oldpwd}" || die "error"
     fi
 
-    shout
-    shout "setup complete..."
-    shout "Now you can install and login with comand\e[1;32hippo"
-    shout "for info use hippo --help"
-    shout
-
+    
+     shout "setup complete...\nNow you can install and login with comand ${GREEN}hippo${DC} \nfor info use hippo --help"
     exit 1
 
 }