add root module

root-module/customize.sh

@@ -1,64 +1,115 @@
 #!/system/bin/sh
+# KernelSU customize.sh for Bluetooth L2CAP Patch
 
 API_URL="https://aln.kavishdevar.me/api"
 TEMP_DIR="$TMPDIR/aln_patch"
 PATCHED_FILE_NAME=""
 SOURCE_FILE=""
 LIBRARY_NAME=""
+APEX_DIR=false
+
+# Ensure temporary directory exists
 mkdir -p "$TEMP_DIR"
 
-log() {
-    echo "[Bluetooth L2CAP Patch] $1"
-}
-
+# Detect the appropriate library file
 if [ -f "/apex/com.android.btservices/lib64/libbluetooth_jni.so" ]; then
     SOURCE_FILE="/apex/com.android.btservices/lib64/libbluetooth_jni.so"
     LIBRARY_NAME="libbluetooth_jni.so"
     PATCHED_FILE_NAME="libbluetooth_jni_patched.so"
-    log "Detected library: libbluetooth_jni.so in /apex/com.android.btservices/lib64/"
+    ui_print "Detected library: libbluetooth_jni.so in /apex/com.android.btservices/lib64/"
 elif [ -f "/system/lib64/libbluetooth_jni.so" ]; then
     SOURCE_FILE="/system/lib64/libbluetooth_jni.so"
     LIBRARY_NAME="libbluetooth_jni.so"
     PATCHED_FILE_NAME="libbluetooth_jni_patched.so"
-    log "Detected library: libbluetooth_jni.so in /system/lib64/"
+    ui_print "Detected library: libbluetooth_jni.so in /system/lib64/"
 elif [ -f "/system/lib64/libbluetooth_qti.so" ]; then
     SOURCE_FILE="/system/lib64/libbluetooth_qti.so"
     LIBRARY_NAME="libbluetooth_qti.so"
     PATCHED_FILE_NAME="libbluetooth_qti_patched.so"
-    log "Detected QTI library: libbluetooth_qti.so in /system/lib64/"
+    ui_print "Detected QTI library: libbluetooth_qti.so in /system/lib64/"
 elif [ -f "/system_ext/lib64/libbluetooth_qti.so" ]; then
     SOURCE_FILE="/system_ext/lib64/libbluetooth_qti.so"
     LIBRARY_NAME="libbluetooth_qti.so"
     PATCHED_FILE_NAME="libbluetooth_qti_patched.so"
-    log "Detected QTI library: libbluetooth_qti.so in /system_ext/lib64/"
+    ui_print "Detected QTI library: libbluetooth_qti.so in /system_ext/lib64/"
 else
-    log "No target library found. Exiting."
-    exit 1
+    ui_print "No target library found. Exiting."
+    abort "No target library found."
 fi
 
-log "Uploading $LIBRARY_NAME to the API for patching..."
-log "If you're concerened about privacy, you can review the source code of the API at https://github.com/kavishdevar/aln/blob/main/root-module-manual/server.py"
+# Upload the detected library for patching
+ui_print "Uploading $LIBRARY_NAME to the API for patching..."
+ui_print "If you're concerned about privacy, review the source code of the API at https://github.com/kavishdevar/aln/blob/main/root-module-manual/server.py"
 PATCHED_FILE_NAME="patched_$LIBRARY_NAME"
 
-curl -s -X POST "$API_URL" \
+set_perm "$MODPATH/system/bin/curl" 0 0 755
+
+CURL_CMD=$(command -v curl || echo "$MODPATH/system/bin/curl")
+
+if [ ! -x "$CURL_CMD" ]; then
+    ui_print "Error: curl is not available, and bundled binary is missing or not executable."
+    abort "Please ensure curl is available on your device."
+fi
+
+$CURL_CMD -s -X POST "$API_URL" \
     -F "file=@$SOURCE_FILE" \
     -F "library_name=$LIBRARY_NAME" \
     -o "$TEMP_DIR/$PATCHED_FILE_NAME" \
     -D "$TEMP_DIR/headers.txt"
 
 if [ -f "$TEMP_DIR/$PATCHED_FILE_NAME" ]; then
-    log "Received patched file from the API."
-    log "Installing patched file to the module's directory..."
-    mkdir -p "$MODPATH/system/lib/"
-    cp "$TEMP_DIR/$PATCHED_FILE_NAME" "$MODPATH/$LIBRARY_NAME"
-    chmod 644 "$MODPATH/$LIBRARY_NAME"
-    log "Patched file has been successfully installed at $MODPATH/$LIBRARY_NAME"
+    ui_print "Received patched file from the API."
+    ui_print "Installing patched file to the module's directory..."
+
+    # Determine the target directory within MODPATH
+    if [[ "$SOURCE_FILE" == *"/system/lib64"* ]]; then
+        TARGET_DIR="$MODPATH/system/lib64"
+    elif [[ "$SOURCE_FILE" == *"/apex/"* ]]; then
+        TARGET_DIR="$MODPATH/system/lib64"
+        APEX_DIR=true
+    else
+        TARGET_DIR="$MODPATH/system/lib"
+    fi
+
+    # Create the target directory
+    mkdir -p "$TARGET_DIR"
+
+    # Copy the patched file to the target directory
+    cp "$TEMP_DIR/$PATCHED_FILE_NAME" "$TARGET_DIR/$LIBRARY_NAME"
+    set_perm "$TARGET_DIR/$LIBRARY_NAME" 0 0 644
+    ui_print "Patched file installed at $TARGET_DIR/$LIBRARY_NAME"
+
+    # Handle apex case
+    if [ "$APEX_DIR" = true ]; then
+        POST_DATA_FS_SCRIPT="$MODPATH/post-data-fs.sh"
+        APEX_LIB_DIR="/apex/com.android.btservices/lib64"
+        MOD_APEX_LIB_DIR="$MODPATH/apex/com.android.btservices/lib64"
+        WORK_DIR="$MODPATH/apex/com.android.btservices/work"
+
+        # Create the necessary directories for apex
+        mkdir -p "$MOD_APEX_LIB_DIR"
+        mkdir -p "$WORK_DIR"
+
+        # Copy the patched file to the apex directory
+        cp "$TEMP_DIR/$PATCHED_FILE_NAME" "$MOD_APEX_LIB_DIR/$LIBRARY_NAME"
+        set_perm "$MOD_APEX_LIB_DIR/$LIBRARY_NAME" 0 0 644
+
+        # Create the post-data-fs.sh script
+        cat <<EOF > "$POST_DATA_FS_SCRIPT"
+#!/system/bin/sh
+mount -t overlay overlay -o lowerdir=$APEX_LIB_DIR,upperdir=$MOD_APEX_LIB_DIR,workdir=$WORK_DIR $APEX_LIB_DIR
+EOF
+
+        set_perm "$POST_DATA_FS_SCRIPT" 0 0 755
+        ui_print "Created post-data-fs.sh script for apex library handling."
+    fi
 else
-    ERROR_MESSAGE=$(grep -oP '(?<="error": ")[^"]+' "$TEMP_DIR/headers.txt")
-    log "API Error: $ERROR_MESSAGE"
+    ERROR_MESSAGE=$(grep -oP '(?<="error": ")[^"]+' "$TEMP_DIR/headers.txt" || echo "Unknown error")
+    ui_print "API Error: $ERROR_MESSAGE"
     rm -rf "$TEMP_DIR"
-    exit 1
+    abort "Failed to patch the library."
 fi
 
+# Clean up temporary files
 rm -rf "$TEMP_DIR"
 exit 0

root-module/post-data-fs.sh

@@ -1,4 +0,0 @@
-#!/system/bin/sh
-
-mount -t overlay overlay -o lowerdir=/apex/com.android.btservices/lib64,upperdir=/data/adb/modules/btl2capfix/apex/com.android.btservices/lib64,workdir=/data/adb/modules/btl2capfix/apex/com.android.btservices/work /apex/com.android.btservices/lib64
-mount -t overlay overlay -o lowerdir=/apex/com.android.btservices@352090000/lib64,upperdir=/data/adb/modules/btl2capfix/apex/com.android.btservices@352090000/lib64,workdir=/data/adb/modules/btl2capfix/apex/com.android.btservices@352090000/work /apex/com.android.btservices@352090000/lib64