update installer

Author: SaicharanKandukuri

install.sh

@@ -1,22 +1,10 @@
 #!/usr/bin/env bash
 
-TPREFIX="/data/data/com.termux/files"
-BIN_DIR="${TPREFIX}/usr/bin"
-UDROID_FILE="scripts/udroid/udroid.sh"
-
-echo "setting udroid..."
-
-if [ -f $UDROID_FILE ]; then
-    if [ -f ${BIN_DIR}/udroid.sh ]; then
-        rm -rf "${BIN_DIR}/udroid.sh"
-    fi
-    cp ${UDROID_FILE} ${BIN_DIR}/udroid
-    chmod 775 ${BIN_DIR}/udroid
-else
-    echo "Installation Failed..."
+[[ ! -d udroid/src ]] && {
+    echo "udroid/src not found"
     exit 1
-fi
+}
 
-echo "Done"
+cd udroid/src || exit 1
 
-exit 0
+bash install.sh

udroid/src/install.sh

@@ -3,9 +3,9 @@
 BIN="$PREFIX/bin"
 INSTALL_DIR="${PREFIX}/etc/udroid"
 
-FSDIR="${PREFIX}/var/lib/udroid"
-FS_INSTALL_DIR="${FS_DIR}/installed_fs"
-DLCACHE="${FSDIR}/dlcache"
+DEFAULT_ROOT="${PREFIX}/var/lib/udroid"
+DEFAULT_FS_INSTALL_DIR="${FS_DIR}/installed_fs"
+DLCACHE="${DEFAULT_ROOT}/dlcache"
 RTCACHE="${RTR}/.cache"
 
 [[ -f ./gum_wrapper.sh ]] && source ./gum_wrapper.sh
@@ -21,8 +21,8 @@ function create_dir() {
 }
 
 create_dir $INSTALL_DIR
-create_dir $FSDIR
-create_dir $FS_INSTALL_DIR
+create_dir $DEFAULT_ROOT
+create_dir $DEFAULT_FS_INSTALL_DIR
 create_dir $DLCACHE
 create_dir $RTCACHE
 

udroid/src/install_sim.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-BIN="/root/anyc/fs-manager-udroid/bin"
-INSTALL_DIR="/root/anyc/fs-manager-udroid/test"
+BIN="fs-manager-udroid/bin"
+INSTALL_DIR="fs-manager-udroid/test"
 
 sleep 2
 ln -sv $INSTALL_DIR/udroid.sh $BIN/udroid

udroid/src/proot-utils/proot-utils.sh

@@ -27,7 +27,7 @@ p_extract() {
     done
 
     [[ -z $file ]] && msg "file not specified" && return 1
-    [[ -z $path ]] && echo "no path provided" && exit 1
+    [[ -z $path ]] && echo "no path provided"  && exit 1
     [[ ! -f $file ]] && msg "file not found" && return 1
     [[ ! -d $path ]] && msg "path not found" && return 1
 

udroid/src/udroid.sh

@@ -9,6 +9,8 @@ source gum_wrapper.sh
 export distro_data
 
 RTR="${PREFIX}/etc/udroid"
+DEFAULT_ROOT="${PREFIX}/var/lib/udroid"
+DEFAULT_FS_INSTALL_DIR="installed-filesystems"
 DLCACHE="${TODO_DIR}/dlcache"
 RTCACHE="${RTR}/.cache"
 
@@ -30,11 +32,30 @@ fetch_distro_data() {
 
 install() {
     local arg=$1
+    local path=""
     local suite=${arg%%:*}
     local varient=${arg#*:}
 
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+            -p | --path) 
+                shift
+                local path=$1
+                LOG "(install) custom installation path set to $path"
+            ;;
+            *) break ;;
+        esac
+    done
+
     LOG "[USER] function args => suite=$suite varient=$varient"
-    [[ -n $TEST_MODE ]] && distro_data=test.json
+    [[ -n $TEST_MODE ]] && {
+        LOG "[TEST] test mode enabled"
+        distro_data=test.json
+        DLCACHE="./tmp/dlcache"
+        mkdir -p $DLCACHE
+        LOG "[TEST] DLCACHE=$DLCACHE"
+        LOG "[TEST] distro_data=$distro_data"
+    }
 
     ############### START OF OPTION PARSER ##############
 
@@ -67,7 +88,7 @@ install() {
     }
 
     # Check if somehow suite and varient are same ( which is not the case )
-    if [[ $suite -eq $varient ]]; then
+    if [[ "$suite" == "$varient" ]]; then
         [[ -n "$suite" ]] && [[ -n "$varient" ]] && {
             ELOG "Parsing error in [$arg] (both can't be same)"
             LOG "function args => suite=$suite varient=$varient"
@@ -108,11 +129,30 @@ install() {
         exit 1 
     }
 
-    # echo "$link + $name"
-    download "$name" "$link"
-
-    # Start Extracting
-    p_extract --file "$DLCACHE/$name" --path "$TODO_DIR"
+    # file extension
+    ext=$(echo $link | awk -F. '{print $NF}')
+    
+    # if path is set then download fs and extract it to path
+    # cause it make better use of path
+    if [[ -z $path ]]; then
+        # echo "$link + $name"
+        download "$name.tar.$ext" "$link"
+
+        # Start Extracting
+        LOG "Extracting $name.tar.$ext"
+        p_extract --file "$DLCACHE/$name.tar.$ext" --path "$DEFAULT_FS_INSTALL_DIR/$name"
+    else
+        download "$name.tar.$ext" "$link" "$path"
+
+        [[ -d $path ]] && {
+            LOG "Extracting $name.tar.$ext"
+            mkdir -p $path/$name
+        } || {
+            ELOG "ERROR: path $path not found"
+            echo "ERROR: path $path not found"
+        }
+        p_extract --file "$path/$name.tar.$ext" --path "$path/$name"
+    fi
 
 }
 
@@ -125,11 +165,19 @@ remove() {
 }
 
 ####################
-downlaod() {
+download() {
     local name=$1
     local link=$2
 
-    axel -o ${DLCACHE}/$name $link
+    [[ -n "$3" ]] && local path=$3
+    [[ -z $path ]] && path="$DLCACHE"
+
+    LOG "download() args => name=$name link=$link path=$path"
+    axel -a -o ${path}/$name $link || {
+        ELOG "failed to download $name"
+        echo "failed to download $name"
+        exit 1
+    }
 }
 ####################