Merge pull request #26 from RandomCoderOrg/revamp-v2.5-login

Revamp v2.5 login

Author: SaicharanKandukuri

.shellcheckrc

@@ -1,2 +1,3 @@
 disable=SC2086
 disable=SC2046
+disable=SC2068

docs/adding_extra_mounts.md

@@ -0,0 +1,33 @@
+# Adding shared folders
+
+In case you want to bind directories directly from host's file system to proot container as shared folders, you can use this.
+
+## How to apply
+
+You can use the traditional `proot-distro` method to use `--bind` argument with paths to bind in syntax `<path in host>:<path to bind in container>` before the name of the distribution. Or custom configuration file named `udroid_proot_mounts` in container root ( at `\`) with paths to bind in format `<path in host>:<path to bind in container>`
+
+### By using argument
+
+In case of binding directly while launching udroid. For adding multiple bindings you can use `--bind` over and over again
+
+```bash
+udroid -l --bind /sdcard:/sdcard jammy:raw
+```
+
+> Note the way `--bind` is used before the name of the distribution `jammy:raw`
+>
+
+### By creating config file
+
+Those binds are written in a file named `udroid_proot_mounts` in the root of the container (at `\`).
+
+> Note that for some udroid builds there may be pre-defined custom mounts points in `udroid_proot_mounts` file. If you want to add your own mounts, you should add them to the end of the file. ( carefull while using redirections to overwrite the file, you may lose the pre-defined mounts )
+
+If adding new binds, you can put directory names with paths like this in `udroid_proot_mounts`
+```bash
+/sdcard:/sdcard
+/sdcard/Music:/root/ext_music
+```
+
+### Note
+Due to android limitations, you cannot get external sdcard paths working like this for non-rooted devices.

install.sh

@@ -1,11 +1,25 @@
 #!/usr/bin/env bash
 
+DIE() { echo -e "${@}"; exit 1 ;:;}
+GWARN() { echo -e "\e[90m${*}\e[0m";:;}
+
 apt install -y jq wget proot pv
 [[ ! -d udroid/src ]] && {
     echo "udroid/src not found"
     exit 1
 }
 
+# Android version warinigs
+android_version_code=$(getprop ro.system.build.version.release)
+if (( $android_version_code >= 12 )); then
+    sleep 1
+    echo
+    GWARN "[Warning]: Android version ${android_version_code} detected"
+    GWARN "You many experience issues like crashing"
+    echo
+    sleep 2
+fi
+
 cd udroid/src || exit 1
 
 bash install.sh

open_source.licenses

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+help_login() {
+    # TODO: Add help for login
+    :
+}
+
+help_list() {
+    echo "udroid [ list| --list ] [options]"
+    echo "options:"
+    echo "  -h, --help    show this help message and exit"
+    echo "  --size        show size of each distro"
+    echo "  --path <path> path to look for distros"
+    echo "  --list-installed  show only installed distros"
+}
+
+help_install() {
+    echo "udroid [ install| --install ] <distro>"
+    echo "installs udroid distros"
+    echo "example:"
+    echo "  udroid install jammy:raw"
+    echo "  udroid install --install jammy:raw"
+}
+
+help_remove() {
+    echo "udroid [ remove| --remove ] <distro>"
+    echo "removes udroid distros"
+    echo "example:"
+    echo "  udroid remove jammy:raw"
+    echo "  udroid remove --remove jammy:raw"
+}

udroid/src/help_udroid.sh

@@ -3,6 +3,7 @@
 BIN="$PREFIX/bin"
 INSTALL_DIR="${PREFIX}/etc/udroid"
 
+RTR="${PREFIX}/etc/udroid"
 DEFAULT_ROOT="${PREFIX}/var/lib/udroid"
 DEFAULT_FS_INSTALL_DIR="${DEFAULT_ROOT}/installed-filesystems"
 DLCACHE="${DEFAULT_ROOT}/dlcache"
@@ -17,14 +18,14 @@ function install_symlinks() {
 
 function create_dir() {
     local remove=$1; shift 1
-    [[ -n $remove ]] && [[ -d $1 ]] && rm -rf $1
+    [[ $remove == 0 ]] && [[ -d $1 ]] && rm -rf $1
     g_spin minidot "Creating directory \"$1\"..." mkdir -p $1    
 }
 
 create_dir 0 $INSTALL_DIR
-create_dir $DEFAULT_ROOT
-create_dir $DEFAULT_FS_INSTALL_DIR
-create_dir $DLCACHE
+create_dir 1 $DEFAULT_ROOT
+create_dir 1 $DEFAULT_FS_INSTALL_DIR
+create_dir 1 $DLCACHE
 create_dir 0 $RTCACHE
 
 g_spin minidot "installing $(basename $(pwd))..." cp -rv ./* $INSTALL_DIR