Merge pull request #4 from RandomCoderOrg/fix01-patch

Fix01 patch

Author: SaicharanKandukuri

etc/scripts/hippo/hippo.sh

@@ -2,6 +2,9 @@
 
 version=1
 
+if [ -n "$HIPPO_BRANCH" ]; then
+    BRANCH="$HIPPO_BRANCH"
+fi
 
 CACHE_ROOT="${HOME}/.uoa-cache-root"
 TPREFIX="/data/data/com.termux/files"
@@ -17,6 +20,13 @@ SOCIAL_PLATFORM="\e[1;34mhttps://discord.gg/TAqaG5sEfW\e[0m"
 # HIPPO_DIR = "${INSTALL_FOLDER}/${HIPPO_DEFAULT}"
 # HIPPO_SCRIPT_FILE="${SCRIPT_DIR}/hippo.sh"
 
+
+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}";:; }
+
+
 function __check_for_hippo() {
     if [ -d ${HIPPO_DIR} ] && [ -f ${HIPPO_SCRIPT_FILE} ]; then
         return 0;
@@ -96,10 +106,17 @@ function __force_uprade_hippo()
 {
     if [ ! -d "$CACHE_ROOT" ]; then
         mkdir "$CACHE_ROOT"
+    else
+        rm -rf "${CACHE_ROOT}/fs-manager-hippo"
     fi
 
     FSM_URL="https://github.com/RandomCoderOrg/fs-manager-hippo"
-    git clone ${FSM_URL} "${CACHE_ROOT}/fs-manager-hippo" || die "failed to clone repo"
+
+    if [ -z "${BRANCH}" ]; then
+        git clone ${FSM_URL} "${CACHE_ROOT}/fs-manager-hippo" || die "failed to clone repo"
+    else
+        git clone -b "${BRANCH}" "${CACHE_ROOT}/fs-manager-hippo" || die "failed to clone repo"
+    fi
 
     if [ -f "${CACHE_ROOT}"/fs-manager-hippo/install.sh ]; then
         cd "${CACHE_ROOT}"/fs-manager-hippo || die "failed to cd ..."
@@ -152,18 +169,17 @@ function _lauch_or_install()
 
 
         pulseaudio --start --load="module-native-protocol-tcp auth-ip-acl=127.0.0.1 auth-anonymous=1" --exit-idle-time=-1 >> /dev/null
-        if [ -f "{CACHE_ROOT}"/ubuntu-on-android/etc/scripts/vncserver/startvnc.sh ] && [ ! -f ${HIPPO_DIR}/bin/startvnc ]; then
-            DIR="{CACHE_ROOT}/ubuntu-on-android/etc/scripts/vncserver/startvnc.sh"
-            cp ${DIR} ${HIPPO_DIR}/bin/startvnc
+        if [[ -f "${CACHE_ROOT}"/ubuntu-on-android/etc/scripts/vncserver/startvnc.sh ]] && [[ ! -f ${HIPPO_DIR}/bin/startvnc ]]; then
+            DIR="${CACHE_ROOT}/ubuntu-on-android/etc/scripts/vncserver/startvnc.sh"
+            cp "${DIR}" ${HIPPO_DIR}/bin/startvnc
             proot-distro login hippo -- chmod 775 /bin/startvnc
         fi
-        if [ -f "{CACHE_ROOT}"/ubuntu-on-android/etc/scripts/vncserver/stopvnc.sh ] && [ ! -f ${HIPPO_DIR}/bin/stopvnc ]; then
+        if [ -f "${CACHE_ROOT}"/ubuntu-on-android/etc/scripts/vncserver/stopvnc.sh ] && [ ! -f ${HIPPO_DIR}/bin/stopvnc ]; then
             DIR="${CACHE_ROOT}/ubuntu-on-android/etc/scripts/vncserver/stopvnc.sh"
             cp "${DIR}" ${HIPPO_DIR}/bin/stopvnc
             proot-distro login hippo -- chmod 775 /bin/stopvnc
         fi
-        
-        proot-distro login hippo "$@"
+        proot-distro login hippo "$@" || warn "program exited unexpectedly..."
     fi
 }
 

install.sh

@@ -6,8 +6,11 @@ BIN_DIR="${TPREFIX}/usr/bin"
 echo "setting hippo..."
 
 if [ -f etc/scripts/hippo/hippo.sh ]; then
-    DIR="etc/scripts/hippo/hippo.sh"
-    cp ${DIR} ${BIN_DIR}/hippo
+    FILE="etc/scripts/hippo/hippo.sh"
+    if [ -f ${BIN_DIR}/hippo.sh ]; then
+        rm -rf "${BIN_DIR}/hippo.sh"
+    fi
+    cp ${FILE} ${BIN_DIR}/hippo
     chmod 775 ${BIN_DIR}/hippo
 else
     echo "Installation Failed..."