Merge pull request #11 from lin1328/main

Fix two outstanding issues

README.md

@@ -1,6 +1,6 @@
 <h2 align="center">Android Subsystem for GNU/Linux</h2>
 
-[![Repo size](https://img.shields.io/github/repo-size/lin1328/asl?logo=github&logoColor=white)](https://github.com/lin1328/asl)
+[![Repo size](https://img.shields.io/github/repo-size/Moe-hacker/asl?logo=github&logoColor=white)](https://github.com/Moe-hacker/asl)
 
 <details>
 <summary><strong>Currently Supported Systems</strong></summary>
@@ -37,7 +37,7 @@
 > - If there are any bugs, please report them. Compatibility with all devices is not guaranteed
 > - If you install the module twice, it will backup old container_dir and install a new container
 > - you can install multipe OS by changeing the module id and ssh port, but this action not supported officially
-## How to connect:
+## How to connect
 Use port 22, user root and password 123456 by default,          
 but, please change the password once you connected to the container, and it's better to use ssh key instead of password login, note that please do not expose the ssh port to the pubnet.       
 ## About the Binary

action.sh

@@ -1,6 +1,6 @@
 MODDIR=${0%/*}
 PORT=$(sed -n 's/^PORT=\(.*\)/\1/p' "$MODDIR/config.conf")
-PID=$("$MODDIR/bin/fuser" "$PORT/tcp" 2>/dev/null)
+PID=$(fuser "$PORT/tcp" 2>/dev/null)
 
 BETA() {
     local PREFIX=/data/user/0/com.termux/files/usr
@@ -43,13 +43,13 @@ BETA() {
 }
 
 update_ssh() {
-    local rootfs="/data/$(sed -n 's/^RURIMA_LXC_OS="\([^"]*\)"/\1/p' "$MODDIR/config.conf")"
+    local rootfs=$(sed -n 's/^CONTAINER_DIR=\(.*\)$/\1/p' "$MODDIR/config.conf")
 
     sleep 2
     if lsof | grep "$rootfs" | awk '{print $2}' | uniq | grep -q "sshd"; then
         sed -i 's|^description=.*|description=\[ running😉 \] Android Subsystem for GNU/Linux Powered by ruri|' "$MODDIR/module.prop"
     else
-        sed -i 's|^description=.*|description=\[ running⚠️ \] Android Subsystem for GNU/Linux Powered by ruri|' "$MODDIR/module.prop"
+        sed -i 's|^description=.*|description=\[ SSH exception⚠️ \] Android Subsystem for GNU/Linux Powered by ruri|' "$MODDIR/module.prop"
     fi
 }
 

bate.sh

@@ -41,7 +41,7 @@ echo
 echo "Welcome to Termux"
 echoRgb "欢迎使用 Android Subsystem for GNU/Linux" 4
 
-for cmd in curl wget rsync; do
+for cmd in curl wget; do
     command -v "$cmd" >/dev/null 2>&1 || abort "! 依赖的命令 $cmd 未安装" 
 done
 
@@ -744,7 +744,7 @@ download_system_image() {
 
     IFS=';' read -r distro version arch variant date path <<< "$version_info"
 
-    local download_url="${base_url}${path}/rootfs.tar.xz"
+    local download_url="${base_url}${path}rootfs.tar.xz"
     local download_file="/data/local/tmp/${os_name}_${version}_rootfs.tar.xz"
 
     mkdir -p "$target_dir" /data/local/tmp
@@ -925,7 +925,6 @@ delete_system() {
     rm -rf "$sys_path"
 
     echo "系统 $os_name 删除成功"
-    pause_func
     return 0
 }
 

config.conf

@@ -1,12 +1,9 @@
-# 本机连接ssh [email protected] -p 22密码123456
-# 请根据你自己的网络环境选择是本机(127.0.0.1)、局域网(192.*.*.*)或公网(ipv4地址)来连接 SSH
-
 # Mirror
 RURIMA_LXC_MIRROR=images.linuxcontainers.org
 RURIMA_LXC_MIRROR_FALLBACK=mirrors.tuna.tsinghua.edu.cn/lxc-images
 
 # OS to install
-# Make sure there is setup/${RURIMA_LXC_OS}.sh
+# Make sure there is ${RURIMA_LXC_OS} in setup/setup.sh
 RURIMA_LXC_OS=ubuntu
 
 # OS version to install
@@ -15,9 +12,6 @@ RURIMA_LXC_OS_VERSION=oracular
 PASSWORD=123456
 PORT=22
 
-# OS dir to install
-# CONTAINER_DIR="/data/${RURIMA_LXC_OS}"
-
 
 # ruri config
 
@@ -30,4 +24,6 @@ PRIVILEGED=false
 RUNTIME=false
 
 
-#
+# OS dir to install
+# The actual directory is the `CONTAINER_DIR` in `customize.sh`
+# CONTAINER_DIR=/data/${RURIMA_LXC_OS}

container_ctrl.sh

@@ -1,13 +1,8 @@
 #!/bin/sh
 
-init_setup() {
-    MODDIR=${0%/*}
-    export PATH="$MODDIR/bin:$PATH"
-    . "$MODDIR/config.conf"
-}
+. "${0%/*}/config.conf"
 
 ruriumount() {
-    init_setup
     fuser -k "$CONTAINER_DIR" >/dev/null 2>&1
     ruri -U "$CONTAINER_DIR" >/dev/null 2>&1
     umount -lvf "$CONTAINER_DIR" 2>/dev/null
@@ -22,11 +17,11 @@ ruriumount() {
 ruristart() {
     ruriumount
 
-    # The servicectl command is an open-source project. If you find it inconvenient to use, you can opt for other startup commands It is not mandatory
-    # e.g. /usr/sbin/sshd
     case "$RURIMA_LXC_OS" in
         archlinux|centos|fedora)
             START_SERVICES="servicectl start sshd"
+            # you can opt for other startup commands It is not mandatory
+            # e.g. /usr/sbin/sshd
             ;;
         debian|kali|ubuntu)
             START_SERVICES="service ssh start"

customize.sh

@@ -21,8 +21,8 @@ bootinspect() {
 link_busybox() {
     local busybox_file=""
 
-    if [ -f "$MODPATH/bin/busybox" ]; then
-        busybox_file="$MODPATH/bin/busybox"
+    if [ -f "$MODPATH/system/xbin/busybox" ]; then
+        busybox_file="$MODPATH/system/xbin/busybox"
     else
         for path in $BUSYBOX_PATHS; do
             if [ -f "$path" ]; then
@@ -33,12 +33,16 @@ link_busybox() {
     fi
 
     if [ -n "$busybox_file" ]; then
-        mkdir -p "$MODPATH/bin"
-        # "$busybox_file" --install -s "$MODPATH/bin"
+        mkdir -p "$MODPATH/system/xbin"
+        # "$busybox_file" --install -s "$MODPATH/system/xbin"
         # This method creates links pointing to all commands of busybox, so it is not recommended. The following is an alternative approach for creating symbolic links pointing to the busybox file for specific commands
-        for cmd in fuser inotifyd; do
-            ln -s "$busybox_file" "$MODPATH/bin/$cmd"
+        for cmd in fuser; do
+            ln -s "$busybox_file" "$MODPATH/system/xbin/$cmd"
         done
+
+        if ! inotifyd --help >/dev/null 2>&1; then
+            ln -sf "$busybox_file" "$MODPATH/system/xbin/inotifyd"
+        fi
     else
         abort "- No available Busybox file found Please check your installation environment"
     fi
@@ -57,19 +61,15 @@ inotifyfile() {
 }
 
 configuration() {
-    set_perm_recursive "$MODPATH/bin" 0 0 0755 0755
+    set_perm_recursive "$MODPATH/system/xbin" 0 0 0755 0755
     . "$MODPATH/config.conf"
 
-    BUSYBOX_PATHS="/data/adb/magisk/busybox
-/data/adb/ksu/bin/busybox
-/data/adb/ap/bin/busybox"
+    BUSYBOX_PATHS="/data/adb/magisk/busybox /data/adb/ksu/bin/busybox /data/adb/ap/bin/busybox"
 
     BASE_DIR="/data"
     CONTAINER_DIR="${BASE_DIR}/${RURIMA_LXC_OS}"
     echo "CONTAINER_DIR=${BASE_DIR}/${RURIMA_LXC_OS}" >> "$MODPATH/config.conf"
 
-    export PATH="$MODPATH/bin:$PATH"
-
     CASE=$(sed -n '/case "\$LXC_OS"/,/^[[:space:]]*esac/p' "$MODPATH/setup/setup.sh")
     SUPPORT=$(echo "$CASE" | \
         sed -n 's/^[[:space:]]*\([a-zA-Z0-9|]*\))$/\1/p' | \

inotify.sh

@@ -8,8 +8,6 @@ if command -v magisk >/dev/null 2>&1; then
     fi
 fi
 
-export PATH="$MODULEDIR/bin:$PATH"
-
 while [ $(getprop sys.boot_completed) != 1 ]; do
     sleep 2
 done
@@ -35,4 +33,4 @@ done
 ) &
 pid=$!
 
-sed -i "6c description=[ PID=$pid ] This container can be quickly controlled by enabling/disabling" "$MODULEDIR/module.prop"
+sed -i "6c description=[ PID=$pid ] This container can be quickly controlled by enabling/disabling" "$MODULEDIR/module.prop"

module.prop

@@ -1,6 +1,6 @@
 id=asl
 name=Android Subsystem for GNU/Linux
-version=v1.0.0
+version=v1.0.1
 versionCode=202412
 author=Moe-hacker & Lin1328
 description=Android Subsystem for GNU/Linux Powered by ruri

setup/setup.sh

@@ -248,8 +248,8 @@ configure_ssh() {
         echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
     fi
 
-    if grep -Eq "^#?\s*PasswordAuthentication" /etc/ssh/sshd_config; then
-        sed -i 's/^#\?\s*PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+    if grep -Eq "^#?\s*PasswordAuthentication\s" /etc/ssh/sshd_config; then
+        sed -i 's/^#\?\s*PasswordAuthentication\s.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
     else
         echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config
     fi