update APP Target SDK

app/build.gradle

@@ -3,18 +3,18 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     lintOptions {
           abortOnError false
      }
     defaultConfig {
         resConfigs "zh"
-        minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 1509
-        versionName "1.5.1-dev"
+        minSdkVersion 25
+        targetSdkVersion 29
+        versionCode 1520
+        versionName "1.5.2-dev"
     }
     buildTypes {
         release {

app/src/main/assets/app_xbin/bin/include/deploy_linux.sh → app/src/main/assets/app_xbin/bin/include/deploy_linux.res

@@ -94,9 +94,9 @@ chmod 770 $cache_rootfs/proc
 mkdir -p $cache_rootfs/dev/net
 # Install dogeland addon
 mkdir -p $cache_rootfs/boot/dogeland/include/
-cp $TOOLKIT/bin/cli.sh $cache_rootfs/boot/dogeland/
+cp $TOOLKIT/bin/toolkit.sh $cache_rootfs/boot/dogeland/
 cp -R $TOOLKIT/bin/include/* $cache_rootfs/boot/dogeland/include/
 # Run Other Setup
-. $TOOLKIT/bin/include/extra_linuxconfigure.sh configure
+. $TOOLKIT/bin/app-addon/extra_linuxconfigure.sh configure
 echo "! All Done"
 }

app/src/main/assets/app_xbin/bin/install_bin.sh

@@ -7,7 +7,7 @@ if [ ! $TOOLKIT ];then
 else
     echo  "">/dev/null
 fi
-$TOOLKIT/preload_res/bin/busybox_$platform chmod -R 0777 $TOOLKIT
+$TOOLKIT/preload_res/bin/busybox_$platform chmod -R +x $TOOLKIT
 function busybox_install() {
     for applet in `./busybox --list`; do
         case "$applet" in
@@ -20,8 +20,9 @@ function busybox_install() {
         esac
     done
 }
+# Install Tools
 $TOOLKIT/preload_res/bin/busybox_$platform cp $TOOLKIT/preload_res/bin/busybox_$platform $TOOLKIT/bin/busybox
-chmod 0770 $TOOLKIT/bin/busybox
+chmod +x $TOOLKIT/bin/busybox
 cd "$TOOLKIT/bin"
 busybox_install
 mkdir $TOOLKIT/lib
@@ -30,6 +31,7 @@ mkdir $TOOLKIT/libexec
 cp $TOOLKIT/preload_res/lib/$platform/* $TOOLKIT/lib/
 cp $TOOLKIT/preload_res/libexec/$platform/* $TOOLKIT/libexec/
 cp $TOOLKIT/preload_res/bin/proot_$platform $TOOLKIT/bin/proot
+# Create Data Dir
 mkdir -p $APP_FILES_DIR
 if [ -d "$APP_FILES_DIR" ];then
   mkdir $CONFIG_DIR
@@ -39,11 +41,18 @@ if [ -d "$APP_FILES_DIR" ];then
   touch $APP_FILES_DIR/filetran
  else
   echo "!Data initialization failed"
-  echo "----------"
   echo "Before reopening the application, please create a new folder named me.flytree.dogeland in the [internal storage/Android/data/] folder."
   exit 3
 fi
+# Unlock Full Toolkit
+rm $TOOLKIT/bin/toolkit.sh
+mv $TOOLKIT/bin/toolkit.shl $TOOLKIT/bin/toolkit.sh
+mv $TOOLKIT/app-addon/extra_linuxconfigure.shl $TOOLKIT/app-addon/extra_linuxconfigure.sh
+mv $TOOLKIT/app-addon/plugin_installer.shl $TOOLKIT/app-addon/plugin_installer.sh
+mv $TOOLKIT/app-addon/set_all.shl $TOOLKIT/app-addon/set_all.sh
+chmod -R a+x $TOOLKIT
+# Write Tag
 touch $TOOLKIT/install_bin_done
+# Clean Up
 rm -rf $TOOLKIT/preload_res
-chmod -R 0770 $TOOLKIT
 rm $TOOLKIT/bin/install_bin.sh

app/src/main/assets/app_xbin/bin/toolkit.sh

@@ -0,0 +1,9 @@
+#
+# dogeland toolkit (basic)
+# v3.0.7
+# 
+# license: GPL-v3.0
+#
+TOOLKIT_RES=$TOOLKIT/bin/include
+. $TOOLKIT_RES/platform.res
+${1}

app/src/main/assets/app_xbin/bin/toolkit.shl

@@ -0,0 +1,36 @@
+#
+# dogeland toolkit
+# v3.0.7
+# 
+# license: GPL-v3.0
+#
+TOOLKIT_RES=$TOOLKIT/bin/include
+# System Mode
+if [ -d "/boot/dogeland/" ];then
+  TOOLKIT_RES=/boot/dogeland/include
+  else
+  echo "">/dev/null
+fi
+. $TOOLKIT_RES/stop_rootfs.res
+. $TOOLKIT_RES/del_rootfs.res
+. $TOOLKIT_RES/platform.res
+. $TOOLKIT_RES/set_env.res
+. $TOOLKIT_RES/check_rootfs.res
+. $TOOLKIT_RES/del_rootfs.res
+. $TOOLKIT_RES/backup_rootfs.res
+. $TOOLKIT_RES/deploy_linux.res
+. $TOOLKIT_RES/bind_main.res
+. $TOOLKIT_RES/starter_fullns.res
+. $TOOLKIT_RES/starter_proot.res
+. $TOOLKIT_RES/starter_unshare.res
+. $TOOLKIT_RES/starter_auto.res
+. $TOOLKIT_RES/exec_fullns.res
+. $TOOLKIT_RES/exec_unshare.res
+. $TOOLKIT_RES/exec_auto.res
+. $TOOLKIT_RES/init_boxenv.res
+. $TOOLKIT_RES/exec_local-shell.res
+. $TOOLKIT_RES/extra_dropbear.res
+. $TOOLKIT_RES/extra_sshd.res
+. $TOOLKIT_RES/extra_patcher.res
+. $TOOLKIT_RES/exec_proot.res
+${1}

app/src/main/assets/master.conf

@@ -1,4 +1,4 @@
-executor_core="file:///android_asset/shell_init.sh"
+executor_core="file:///android_asset/shell_init.res"
 page_list_config="file:///android_asset/pages/gvsEewI7.xml"
 favorite_config="file:///android_asset/pages/vwox9icd.xml"
 allow_home_page="0"

app/src/main/assets/pages/5YoxqlDU.xml

@@ -15,7 +15,7 @@
             if [ -e "$rootfs/usr/local/lib/libandroid-shmem.so" ];then
              echo "1"
              else
-              $TOOLKIT/bin/cli.sh check_rootfs
+              $TOOLKIT/bin/toolkit.sh check_rootfs
              cp $TOOLKIT/lib/libandroid-shmem.so $rootfs/usr/local/lib/
              fi
             </set>

app/src/main/assets/pages/EMT9DJAH.xml

@@ -8,7 +8,7 @@
                 <param name="USER_NAME" label="登录用户" title="" placeholder="" type="text" />
                 <param name="USER_PASSWORD" label="登录密码" title="" placeholder="" type="text" />
                 <param name="datas" label="安装到数据目录" type="switch" />
-            <set>$TOOLKIT/bin/cli.sh deploy_linux_tgz</set>
+            <set>$TOOLKIT/bin/toolkit.sh deploy_linux_tgz</set>
         </action>
         </group>
         <group>
@@ -19,6 +19,6 @@
                 <param name="USER_NAME" label="登录用户" title="" placeholder="" type="text" />
                 <param name="USER_PASSWORD" label="登录密码" title="" placeholder="" type="text" />
                 <param name="datas" label="安装到数据目录" type="switch" />
-            <set>$TOOLKIT/bin/cli.sh deploy_linux_txz</set>
+            <set>$TOOLKIT/bin/toolkit.sh deploy_linux_txz</set>
         </action>
         </group>

app/src/main/assets/pages/vwox9icd.xml

@@ -13,7 +13,7 @@
             </param>
             <param name="addcmd" label="AddonCmd" type="text" />
             <param name="boxenv" label="Sandbox Mode" type="switch" />
-            <set>$TOOLKIT/bin/cli.sh $start</set>
+            <set>$TOOLKIT/bin/toolkit.sh $start</set>
             </action>
             </group>
             <group>
@@ -29,7 +29,7 @@
                 <option value="exec_localshell">[sh]</option>
             </param>
             <param name="boxenv" label="Sandbox Mode" type="switch" />
-            <set>$TOOLKIT/bin/cli.sh $exec</set>
+            <set>$TOOLKIT/bin/toolkit.sh $exec</set>
         </action>
     </group>
 </items>

app/src/main/assets/pages/wyr1nmlc.xml

@@ -15,8 +15,8 @@
           <action>
             <title>dogeland-addon启动设置</title>
              <param name="type">
-                <option value="/bin/sh /boot/dogeland/cli.sh sshd_start">启动openssh-sshd</option>
-                <option value="/bin/sh /boot/dogeland/cli.sh dropbear_start">启动dropbear</option>
+                <option value="/bin/sh /boot/dogeland/toolkit.sh sshd_start">启动openssh-sshd</option>
+                <option value="/bin/sh /boot/dogeland/toolkit.sh dropbear_start">启动dropbear</option>
                 <option value="/lib/systemd --system">[fullns]systemd</option>
                 <option value="/sbin/init">[fullns]init</option>
             </param>
@@ -34,13 +34,13 @@
         <action>
             <title>导出Rootfs</title>
              <param name="dir" type="folder" value="/sdcard/Android/data/me.flytree.dogeland/" editable="true"/>
-            <set> $TOOLKIT/bin/cli.sh backup_rootfs</set>
+            <set> $TOOLKIT/bin/toolkit.sh backup_rootfs</set>
         </action>
            </group>
            <group title="高级">
              <action warning="这将会删除容器上的系统和用户数据,并且操作不可逆,仍要继续吗？">
             <title>移除已安装Rootfs</title>
-            <set> $TOOLKIT/bin/cli.sh del_rootfs</set>
+            <set> $TOOLKIT/bin/toolkit.sh del_rootfs</set>
         </action>
          <action>
             <title>开启 QEMU-USER 支持</title>

app/src/main/assets/shell_init.sh → app/src/main/assets/shell_init.res

@@ -1,6 +1,3 @@
-#
-# dogeland shell init
-#
 export START_DIR=$({START_DIR})
 export SDCARD_PATH=$({SDCARD_PATH})
 export PACKAGE_NAME=$({PACKAGE_NAME})
@@ -10,7 +7,7 @@ export PATH="/system/bin:/sbin:$TOOLKIT/bin"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TOOLKIT/lib"
 export TMPDIR="$TOOLKIT/tmp"
 export CONFIG_DIR="$APP_FILES_DIR/config"
-export platform=$(sh $TOOLKIT/bin/cli.sh platform_check)
+export platform=$(sh $TOOLKIT/bin/toolkit.sh platform_check)
 export cmd=$(cat $CONFIG_DIR/cmdline.config)
 export rootfs=$(cat $CONFIG_DIR/rootfs.config)
 if [[ -f "$TOOLKIT/install_bin_done" ]]; then