fixed stuff

Author: RohitKushvaha01

src/plugins/terminal/scripts/init-alpine.sh

@@ -30,7 +30,14 @@ fi
 [ ! -L /bin/login ] && mv /bin/login /bin/real_login
 ln -sf /bin/bash /bin/login
 
+if [ "$1" = "--installing" ]; then
+  echo "Installation completed."
+  exit 0
+fi
+
+
 if [ "$#" -eq 0 ]; then
+    chmod +x $PREFIX/axs
     $PREFIX/axs
 else
     exec "$@"

src/plugins/terminal/scripts/init-sandbox.sh

@@ -12,4 +12,4 @@ fi
 ln -s "$NATIVE_DIR/libtalloc.so" "$PREFIX/libtalloc.so.2"
 
 
-$NATIVE_DIR/libproot-xed.so -b $PREFIX:$PREFIX -b /data:/data -b /system:/system -b /vendor:/vendor -R $PREFIX/alpine sh $PREFIX/init-alpine.sh "$@"
+$NATIVE_DIR/libproot-xed.so -b $PREFIX:$PREFIX -b /data:/data -b /system:/system -b /vendor:/vendor -S $PREFIX/alpine /bin/sh $PREFIX/init-alpine.sh "$@"

src/plugins/terminal/src/android/Executor.java

@@ -8,6 +8,8 @@
 import java.util.concurrent.*;
 import android.content.Context;
 import android.app.Activity;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 
 public class Executor extends CordovaPlugin {
 
@@ -68,6 +70,16 @@ private void exec(String cmd, CallbackContext callbackContext) {
                 env.put("PREFIX", context.getFilesDir().getAbsolutePath());
                 env.put("NATIVE_DIR", context.getApplicationInfo().nativeLibraryDir);
 
+                try {
+    int target = context.getPackageManager()
+                        .getPackageInfo(context.getPackageName(), 0)
+                        .applicationInfo.targetSdkVersion;
+    env.put("FDROID", String.valueOf(target <= 28));
+} catch (PackageManager.NameNotFoundException e) {
+    e.printStackTrace();
+}
+
+
                 Process process = builder.start();
 
                 // Capture stdout
@@ -116,6 +128,16 @@ private void startProcess(String pid, String cmd, CallbackContext callbackContex
                 env.put("PREFIX", context.getFilesDir().getAbsolutePath());
                 env.put("NATIVE_DIR", context.getApplicationInfo().nativeLibraryDir);
 
+                try {
+    int target = context.getPackageManager()
+                        .getPackageInfo(context.getPackageName(), 0)
+                        .applicationInfo.targetSdkVersion;
+    env.put("FDROID", String.valueOf(target <= 28));
+} catch (PackageManager.NameNotFoundException e) {
+    e.printStackTrace();
+}
+
+
                 Process process = builder.start();
 
                 processes.put(pid, process);

src/plugins/terminal/www/Terminal.js

@@ -4,7 +4,7 @@ const Executor = require("./Executor");
 const AXS_VERSION_TAG="v0.2.5"
 
 const Terminal = {
-    async startAxs(logger = console.log,err_logger = console.error){ 
+    async startAxs(installing = false,logger = console.log,err_logger = console.error){ 
         const filesDir = await new Promise((resolve, reject) => {
             system.getFilesDir(resolve, reject);
         });
@@ -21,16 +21,13 @@ const Terminal = {
             logger(data);
           }).then(async (pid) => {
             system.writeText(`${filesDir}/pid`,pid,logger,err_logger)
-            await Executor.write(pid,`source ${filesDir}/init-sandbox.sh; exit`);
+            await Executor.write(pid, `source ${filesDir}/init-sandbox.sh ${installing ? "--installing" : ""}; exit`);
           });
         })
 
     },
 
     async stopAxs(){
-      if (await this.isInstalled()) return;
-      if (!(await this.isSupported())) return;
-
       const pidExists = await new Promise((resolve, reject) => {
         system.fileExists(`${filesDir}/pid`, false, (result) => {
           resolve(result == 1);
@@ -45,9 +42,6 @@ const Terminal = {
     },
 
     async isAxsRunning(){
-      if (await this.isInstalled()) return false;
-      if (!(await this.isSupported())) return false;
-
       const pidExists = await new Promise((resolve, reject) => {
         system.fileExists(`${filesDir}/pid`, false, (result) => {
           resolve(result == 1);
@@ -78,13 +72,13 @@ const Terminal = {
           let alpineUrl;
           let axsUrl;
           if (arch === "arm64-v8a") {
-            axsUrl = `https://github.com/bajrangCoder/acodex_server/releases/download/${AXS_VERSION_TAG}/axs-aarch64-unknown-linux-musl`
+            axsUrl = `https://github.com/bajrangCoder/acodex_server/releases/download/${AXS_VERSION_TAG}/axs-musl-android-arm64`
             alpineUrl = "https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/aarch64/alpine-minirootfs-3.21.0-aarch64.tar.gz";
           } else if (arch === "armeabi-v7a") {
-            axsUrl = `https://github.com/bajrangCoder/acodex_server/releases/download/${AXS_VERSION_TAG}/axs-android-armv7`
+            axsUrl = `https://github.com/bajrangCoder/acodex_server/releases/download/${AXS_VERSION_TAG}/axs-musl-android-armv7`
             alpineUrl = "https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/armhf/alpine-minirootfs-3.21.0-armhf.tar.gz";
           } else if (arch === "x86_64") {
-            axsUrl = `https://github.com/bajrangCoder/acodex_server/releases/download/${AXS_VERSION_TAG}/axs-android-x86_64`
+            axsUrl = `https://github.com/bajrangCoder/acodex_server/releases/download/${AXS_VERSION_TAG}/axs-musl-android-x86_64`
             alpineUrl = "https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/x86_64/alpine-minirootfs-3.21.0-x86_64.tar.gz";
           } else {
             throw new Error(`Unsupported architecture: ${arch}`);
@@ -135,6 +129,9 @@ const Terminal = {
           await new Promise((resolve, reject) => {
             system.mkdirs(`${filesDir}/.extracted`, resolve, reject);
           });
+
+          //update system and install required packages
+          this.startAxs(true,logger,err_logger)
 
         } catch (e) {
           err_logger("Installation failed:", e);
@@ -196,8 +193,8 @@ function readAsset(assetPath, callback) {
 
       reader.onloadend = () => callback(reader.result);
       reader.readAsText(file);
-    }, err_logger);
-  }, err_logger);
+    },console.error);
+  }, console.error);
 }