Refactor: CLI Core

zhouxinhao1208 · May 22, 2021 · f354470 · f354470
1 parent 1bb469d
commit f354470
Show file tree

Hide file tree

Showing 49 changed files with 2 additions and 2 deletions.
diff --git a/app/src/main/assets/app_xbin/bin/include/extra_linuxconfigure.sh b/app/src/main/assets/app_xbin/bin/include/extra_linuxconfigure.sh
@@ -108,7 +108,7 @@ configure()
     echo "aid_$(id -un):x:$(id -u):$(id -g):Android user:/:/usr/sbin/nologin" >> "$rootfs/etc/passwd"
     echo "aid_$(id -un):*:18446:0:99999:7:::" >> "$rootfs/etc/shadow"
     local aid
-        for aid in $(cat "$TOOLKIT/include/android_groups")
+        for aid in $(cat "$TOOLKIT/bin/include/android_groups")
         do
             local xname=$(echo ${aid} | awk -F: '{print $1}')
             local xid=$(echo ${aid} | awk -F: '{print $2}')

diff --git a/...c/main/assets/app_xbin/bin/virtual/dotest → app/src/main/assets/app_xbin/virtual/dotest b/...c/main/assets/app_xbin/bin/virtual/dotest → app/src/main/assets/app_xbin/virtual/dotest
diff --git a/...ets/app_xbin/bin/virtual/fs/proc/app_info → .../assets/app_xbin/virtual/fs/proc/app_info b/...ets/app_xbin/bin/virtual/fs/proc/app_info → .../assets/app_xbin/virtual/fs/proc/app_info
diff --git a/...ts/app_xbin/bin/virtual/fs/proc/buddyinfo → ...assets/app_xbin/virtual/fs/proc/buddyinfo b/...ts/app_xbin/bin/virtual/fs/proc/buddyinfo → ...assets/app_xbin/virtual/fs/proc/buddyinfo
diff --git a/...bin/bin/virtual/fs/proc/bus/input/devices → ...pp_xbin/virtual/fs/proc/bus/input/devices b/...bin/bin/virtual/fs/proc/bus/input/devices → ...pp_xbin/virtual/fs/proc/bus/input/devices
diff --git a/...in/bin/virtual/fs/proc/bus/input/handlers → ...p_xbin/virtual/fs/proc/bus/input/handlers b/...in/bin/virtual/fs/proc/bus/input/handlers → ...p_xbin/virtual/fs/proc/bus/input/handlers
diff --git a/..._xbin/bin/virtual/fs/proc/bus/pci/devices → .../app_xbin/virtual/fs/proc/bus/pci/devices b/..._xbin/bin/virtual/fs/proc/bus/pci/devices → .../app_xbin/virtual/fs/proc/bus/pci/devices
diff --git a/...sets/app_xbin/bin/virtual/fs/proc/cgroups → ...n/assets/app_xbin/virtual/fs/proc/cgroups b/...sets/app_xbin/bin/virtual/fs/proc/cgroups → ...n/assets/app_xbin/virtual/fs/proc/cgroups
diff --git a/...sets/app_xbin/bin/virtual/fs/proc/cmdline → ...n/assets/app_xbin/virtual/fs/proc/cmdline b/...sets/app_xbin/bin/virtual/fs/proc/cmdline → ...n/assets/app_xbin/virtual/fs/proc/cmdline
diff --git a/...ets/app_xbin/bin/virtual/fs/proc/consoles → .../assets/app_xbin/virtual/fs/proc/consoles b/...ets/app_xbin/bin/virtual/fs/proc/consoles → .../assets/app_xbin/virtual/fs/proc/consoles
diff --git a/...ssets/app_xbin/bin/virtual/fs/proc/crypto → ...in/assets/app_xbin/virtual/fs/proc/crypto b/...ssets/app_xbin/bin/virtual/fs/proc/crypto → ...in/assets/app_xbin/virtual/fs/proc/crypto
diff --git a/...sets/app_xbin/bin/virtual/fs/proc/devices → ...n/assets/app_xbin/virtual/fs/proc/devices b/...sets/app_xbin/bin/virtual/fs/proc/devices → ...n/assets/app_xbin/virtual/fs/proc/devices
diff --git a/...ts/app_xbin/bin/virtual/fs/proc/diskstats → ...assets/app_xbin/virtual/fs/proc/diskstats b/...ts/app_xbin/bin/virtual/fs/proc/diskstats → ...assets/app_xbin/virtual/fs/proc/diskstats
diff --git a/.../app_xbin/bin/virtual/fs/proc/execdomains → ...sets/app_xbin/virtual/fs/proc/execdomains b/.../app_xbin/bin/virtual/fs/proc/execdomains → ...sets/app_xbin/virtual/fs/proc/execdomains
diff --git a/...in/assets/app_xbin/bin/virtual/fs/proc/fb → ...c/main/assets/app_xbin/virtual/fs/proc/fb b/...in/assets/app_xbin/bin/virtual/fs/proc/fb → ...c/main/assets/app_xbin/virtual/fs/proc/fb
diff --git a/.../app_xbin/bin/virtual/fs/proc/filesystems → ...sets/app_xbin/virtual/fs/proc/filesystems b/.../app_xbin/bin/virtual/fs/proc/filesystems → ...sets/app_xbin/virtual/fs/proc/filesystems
diff --git a/...s/app_xbin/bin/virtual/fs/proc/interrupts → ...ssets/app_xbin/virtual/fs/proc/interrupts b/...s/app_xbin/bin/virtual/fs/proc/interrupts → ...ssets/app_xbin/virtual/fs/proc/interrupts
diff --git a/...assets/app_xbin/bin/virtual/fs/proc/iomem → ...ain/assets/app_xbin/virtual/fs/proc/iomem b/...assets/app_xbin/bin/virtual/fs/proc/iomem → ...ain/assets/app_xbin/virtual/fs/proc/iomem
diff --git a/...sets/app_xbin/bin/virtual/fs/proc/ioports → ...n/assets/app_xbin/virtual/fs/proc/ioports b/...sets/app_xbin/bin/virtual/fs/proc/ioports → ...n/assets/app_xbin/virtual/fs/proc/ioports
diff --git a/...ets/app_xbin/bin/virtual/fs/proc/kallsyms → .../assets/app_xbin/virtual/fs/proc/kallsyms b/...ets/app_xbin/bin/virtual/fs/proc/kallsyms → .../assets/app_xbin/virtual/fs/proc/kallsyms
diff --git a/...ts/app_xbin/bin/virtual/fs/proc/key-users → ...assets/app_xbin/virtual/fs/proc/key-users b/...ts/app_xbin/bin/virtual/fs/proc/key-users → ...assets/app_xbin/virtual/fs/proc/key-users
diff --git a/.../assets/app_xbin/bin/virtual/fs/proc/keys → ...main/assets/app_xbin/virtual/fs/proc/keys b/.../assets/app_xbin/bin/virtual/fs/proc/keys → ...main/assets/app_xbin/virtual/fs/proc/keys
diff --git a/.../assets/app_xbin/bin/virtual/fs/proc/kmsg → ...main/assets/app_xbin/virtual/fs/proc/kmsg b/.../assets/app_xbin/bin/virtual/fs/proc/kmsg → ...main/assets/app_xbin/virtual/fs/proc/kmsg
diff --git a/...s/app_xbin/bin/virtual/fs/proc/kpagecount → ...ssets/app_xbin/virtual/fs/proc/kpagecount b/...s/app_xbin/bin/virtual/fs/proc/kpagecount → ...ssets/app_xbin/virtual/fs/proc/kpagecount
diff --git a/...s/app_xbin/bin/virtual/fs/proc/kpageflags → ...ssets/app_xbin/virtual/fs/proc/kpageflags b/...s/app_xbin/bin/virtual/fs/proc/kpageflags → ...ssets/app_xbin/virtual/fs/proc/kpageflags
diff --git a/...pp_xbin/bin/virtual/fs/proc/latency_stats → ...ts/app_xbin/virtual/fs/proc/latency_stats b/...pp_xbin/bin/virtual/fs/proc/latency_stats → ...ts/app_xbin/virtual/fs/proc/latency_stats
diff --git a/...sets/app_xbin/bin/virtual/fs/proc/loadavg → ...n/assets/app_xbin/virtual/fs/proc/loadavg b/...sets/app_xbin/bin/virtual/fs/proc/loadavg → ...n/assets/app_xbin/virtual/fs/proc/loadavg
diff --git a/...assets/app_xbin/bin/virtual/fs/proc/locks → ...ain/assets/app_xbin/virtual/fs/proc/locks b/...assets/app_xbin/bin/virtual/fs/proc/locks → ...ain/assets/app_xbin/virtual/fs/proc/locks
diff --git a/.../assets/app_xbin/bin/virtual/fs/proc/misc → ...main/assets/app_xbin/virtual/fs/proc/misc b/.../assets/app_xbin/bin/virtual/fs/proc/misc → ...main/assets/app_xbin/virtual/fs/proc/misc
diff --git a/...sets/app_xbin/bin/virtual/fs/proc/modules → ...n/assets/app_xbin/virtual/fs/proc/modules b/...sets/app_xbin/bin/virtual/fs/proc/modules → ...n/assets/app_xbin/virtual/fs/proc/modules
diff --git a/...ssets/app_xbin/bin/virtual/fs/proc/mounts → ...in/assets/app_xbin/virtual/fs/proc/mounts b/...ssets/app_xbin/bin/virtual/fs/proc/mounts → ...in/assets/app_xbin/virtual/fs/proc/mounts
diff --git a/...app_xbin/bin/virtual/fs/proc/pagetypeinfo → ...ets/app_xbin/virtual/fs/proc/pagetypeinfo b/...app_xbin/bin/virtual/fs/proc/pagetypeinfo → ...ets/app_xbin/virtual/fs/proc/pagetypeinfo
diff --git a/...s/app_xbin/bin/virtual/fs/proc/partitions → ...ssets/app_xbin/virtual/fs/proc/partitions b/...s/app_xbin/bin/virtual/fs/proc/partitions → ...ssets/app_xbin/virtual/fs/proc/partitions
diff --git a/.../app_xbin/bin/virtual/fs/proc/sched_debug → ...sets/app_xbin/virtual/fs/proc/sched_debug b/.../app_xbin/bin/virtual/fs/proc/sched_debug → ...sets/app_xbin/virtual/fs/proc/sched_debug
diff --git a/...ts/app_xbin/bin/virtual/fs/proc/schedstat → ...assets/app_xbin/virtual/fs/proc/schedstat b/...ts/app_xbin/bin/virtual/fs/proc/schedstat → ...assets/app_xbin/virtual/fs/proc/schedstat
diff --git a/...ets/app_xbin/bin/virtual/fs/proc/slabinfo → .../assets/app_xbin/virtual/fs/proc/slabinfo b/...ets/app_xbin/bin/virtual/fs/proc/slabinfo → .../assets/app_xbin/virtual/fs/proc/slabinfo
diff --git a/...ets/app_xbin/bin/virtual/fs/proc/softirqs → .../assets/app_xbin/virtual/fs/proc/softirqs b/...ets/app_xbin/bin/virtual/fs/proc/softirqs → .../assets/app_xbin/virtual/fs/proc/softirqs
diff --git a/.../assets/app_xbin/bin/virtual/fs/proc/stat → ...main/assets/app_xbin/virtual/fs/proc/stat b/.../assets/app_xbin/bin/virtual/fs/proc/stat → ...main/assets/app_xbin/virtual/fs/proc/stat
diff --git a/...assets/app_xbin/bin/virtual/fs/proc/swaps → ...ain/assets/app_xbin/virtual/fs/proc/swaps b/...assets/app_xbin/bin/virtual/fs/proc/swaps → ...ain/assets/app_xbin/virtual/fs/proc/swaps
diff --git a/...pp_xbin/bin/virtual/fs/proc/sysrq-trigger → ...ts/app_xbin/virtual/fs/proc/sysrq-trigger b/...pp_xbin/bin/virtual/fs/proc/sysrq-trigger → ...ts/app_xbin/virtual/fs/proc/sysrq-trigger
diff --git a/...s/app_xbin/bin/virtual/fs/proc/timer_list → ...ssets/app_xbin/virtual/fs/proc/timer_list b/...s/app_xbin/bin/virtual/fs/proc/timer_list → ...ssets/app_xbin/virtual/fs/proc/timer_list
diff --git a/...ssets/app_xbin/bin/virtual/fs/proc/uptime → ...in/assets/app_xbin/virtual/fs/proc/uptime b/...ssets/app_xbin/bin/virtual/fs/proc/uptime → ...in/assets/app_xbin/virtual/fs/proc/uptime
diff --git a/...sets/app_xbin/bin/virtual/fs/proc/version → ...n/assets/app_xbin/virtual/fs/proc/version b/...sets/app_xbin/bin/virtual/fs/proc/version → ...n/assets/app_xbin/virtual/fs/proc/version
diff --git a/.../app_xbin/bin/virtual/fs/proc/vmallocinfo → ...sets/app_xbin/virtual/fs/proc/vmallocinfo b/.../app_xbin/bin/virtual/fs/proc/vmallocinfo → ...sets/app_xbin/virtual/fs/proc/vmallocinfo
diff --git a/...ssets/app_xbin/bin/virtual/fs/proc/vmstat → ...in/assets/app_xbin/virtual/fs/proc/vmstat b/...ssets/app_xbin/bin/virtual/fs/proc/vmstat → ...in/assets/app_xbin/virtual/fs/proc/vmstat
diff --git a/...ets/app_xbin/bin/virtual/fs/proc/zoneinfo → .../assets/app_xbin/virtual/fs/proc/zoneinfo b/...ets/app_xbin/bin/virtual/fs/proc/zoneinfo → .../assets/app_xbin/virtual/fs/proc/zoneinfo
diff --git a/...al/fs/sys/firmware/device-tree/base/model → ...al/fs/sys/firmware/device-tree/base/model b/...al/fs/sys/firmware/device-tree/base/model → ...al/fs/sys/firmware/device-tree/base/model
diff --git a/...assets/app_xbin/bin/virtual/socket/dotest → ...ain/assets/app_xbin/virtual/socket/dotest b/...assets/app_xbin/bin/virtual/socket/dotest → ...ain/assets/app_xbin/virtual/socket/dotest
diff --git a/app/src/main/assets/shell_init.sh b/app/src/main/assets/shell_init.sh
@@ -8,7 +8,7 @@ export TOOLKIT="$START_DIR/app_xbin"
 export APP_FILES_DIR="$SDCARD_PATH/Android/data/$PACKAGE_NAME/files/"
 export PATH="/system/bin:/sbin:$TOOLKIT"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TOOLKIT/lib"
-export TMPDIR="$TOOLKIT/cache"
+export TMPDIR="$TOOLKIT/tmp"
 export CONFIG_DIR="$APP_FILES_DIR/config"
 export PROOT_TMP_DIR="$TMPDIR"
 export PROOT_LOADER="$TOOLKIT/libexec/libloader.so"