All files are moved to the environment directory

Author: meefik

CHANGELOG

@@ -416,12 +416,12 @@ Updated list packages of base system installation
 
 2.1.1
 Добавлена поддержка Fedora 28 (закончена поддержка 27 и более ранних)
+Улучшена работа веб-терминала
 Исправлена поддержка Arch Linux i686 (http://mirror.archlinux32.org)
 Исправлена проблема с начальной установкой Arch Linux (тикет #986)
 Исправлена проблема с установкой CentOS (тикет #972)
 Исправлена проблема с NSS и systemd (тикет #971)
 Исправлена проблема с unchroot am
-Улучшена работа веб-терминала
 
 2.1.0
 Добавлена поддержка Ubuntu 18.04 LTS (bionic)

app/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId 'ru.meefik.linuxdeploy'
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 240
+        versionCode 241
         versionName "2.1.1"
     }
     buildTypes {

app/src/main/assets/bin/all/websocket.sh

@@ -1,4 +1,4 @@
-#!/data/data/ru.meefik.linuxdeploy/bin/sh
+#!/data/data/ru.meefik.linuxdeploy/env/bin/sh
 # websocket.sh
 # (C) 2016-2018 Anton Skshidlevsky <meefik@gmail.com>, MIT
 # The cross platform WebSocket implementation for SH.

app/src/main/assets/env

@@ -1,4 +1,4 @@
-#!/data/data/ru.meefik.linuxdeploy/bin/sh
+#!/data/data/ru.meefik.linuxdeploy/env/bin/sh
 
 echo "Content-type: text/html"
 echo ""

app/src/main/assets/web/cgi-bin/resize

@@ -1,4 +1,4 @@
-#!/data/data/ru.meefik.linuxdeploy/bin/sh
+#!/data/data/ru.meefik.linuxdeploy/env/bin/sh
 
 echo 'Content-Type: application/octet-stream'
 echo 'Content-Transfer-Encoding: binary'

app/src/main/assets/web/cgi-bin/sync

@@ -1,4 +1,4 @@
-#!/data/data/ru.meefik.linuxdeploy/bin/sh
+#!/data/data/ru.meefik.linuxdeploy/env/bin/sh
 
 echo "Content-type: text/html"
 echo ""

app/src/main/assets/web/cgi-bin/terminal

@@ -200,7 +200,7 @@ private static boolean isRooted() {
      */
     private static boolean setVersion(Context c) {
         boolean result = false;
-        String f = PrefStore.getDataDir(c) + "/version";
+        String f = PrefStore.getEnvDir(c) + "/version";
         BufferedWriter bw = null;
         try {
             bw = new BufferedWriter(new FileWriter(f));
@@ -221,7 +221,7 @@ private static boolean setVersion(Context c) {
      * @return true if success
      */
     static boolean isLatestVersion(Context c) {
-        File f = new File(PrefStore.getDataDir(c) + "/version");
+        File f = new File(PrefStore.getEnvDir(c) + "/version");
         if (!f.exists()) return false;
         boolean result = false;
         BufferedReader br = null;
@@ -237,17 +237,6 @@ static boolean isLatestVersion(Context c) {
         return result;
     }
 
-    /**
-     * Remove version file
-     *
-     * @param c context
-     * @return true if success
-     */
-    private static boolean resetVersion(Context c) {
-        File f = new File(PrefStore.getDataDir(c) + "/version");
-        return f.delete();
-    }
-
     /**
      * Make linuxdeploy script
      *
@@ -263,7 +252,6 @@ private static boolean makeScript(Context c) {
             bw.write("#!" + PrefStore.getShell(c) + "\n");
             bw.write("PATH=" + PrefStore.getPath(c) + ":$PATH\n");
             bw.write("ENV_DIR=\"" + PrefStore.getEnvDir(c) + "\"\n");
-            bw.write("TEMP_DIR=\"" + PrefStore.getTmpDir(c) + "\"\n");
             bw.write(". \"${ENV_DIR}/cli.sh\"\n");
             result = true;
         } catch (IOException e) {
@@ -351,47 +339,34 @@ static boolean updateEnv(final Context c) {
         // stop services
         execServices(c, new String[]{"telnetd", "httpd"}, "stop");
 
+        // extract env assets
+        if (!extractDir(c, PrefStore.getEnvDir(c), "env", "")) return false;
+
         // extract bin assets
         if (!extractDir(c, PrefStore.getBinDir(c), "bin/all", "")) return false;
         if (!extractDir(c, PrefStore.getBinDir(c), "bin/" + PrefStore.getArch(), "")) return false;
 
-        // extract env assets
-        if (!extractDir(c, PrefStore.getEnvDir(c), "env", "")) return false;
-
         // extract web assets
         if (!extractDir(c, PrefStore.getWebDir(c), "web", "")) return false;
 
         // make linuxdeploy script
         if (!makeScript(c)) return false;
 
-        // bin directory
+        // set executable bin directory
         File binDir = new File(PrefStore.getBinDir(c));
         setPermissions(binDir, true);
 
-        // env directory
-        File envDir = new File(PrefStore.getEnvDir(c));
-        setPermissions(envDir, false);
-
-        // web directory
-        File webDir = new File(PrefStore.getWebDir(c));
-        setPermissions(webDir, false);
+        // set executable cgi-bin directory
         File cgiDir = new File(PrefStore.getWebDir(c) + "/cgi-bin");
         setPermissions(cgiDir, true);
 
-        // etc directory
-        File etcDir = new File(PrefStore.getEtcDir(c));
-        etcDir.mkdirs();
-        setPermissions(etcDir, false);
+        // make config directory
+        File configDir = new File(PrefStore.getConfigDir(c));
+        configDir.mkdirs();
 
-        // tmp directory
+        // make tmp directory
         File tmpDir = new File(PrefStore.getTmpDir(c));
         tmpDir.mkdirs();
-        setPermissions(tmpDir, false);
-
-        // config directory
-        File configDir = new File(PrefStore.getConfigDir(c));
-        configDir.mkdirs();
-        setPermissions(configDir, false);
 
         // create .nomedia
         File noMedia = new File(PrefStore.getEnvDir(c) + "/.nomedia");
@@ -463,36 +438,17 @@ private static boolean removeSymlink(Context c) {
      * @return true if success
      */
     static boolean removeEnv(Context c) {
-        // remove version file
-        resetVersion(c);
-
         // stop services
         execServices(c, new String[]{"telnetd", "httpd"}, "stop");
 
         // remove symlink
         File ldSymlink = new File("/system/bin/linuxdeploy");
         if (ldSymlink.exists()) removeSymlink(c);
 
-        // clean web directory
-        File webDir = new File(PrefStore.getWebDir(c));
-        cleanDirectory(webDir);
-
         // clean env directory
         File envDir = new File(PrefStore.getEnvDir(c));
         cleanDirectory(envDir);
 
-        // clean etc directory
-        File etcDir = new File(PrefStore.getEtcDir(c));
-        cleanDirectory(etcDir);
-
-        // clean bin directory
-        File binDir = new File(PrefStore.getBinDir(c));
-        cleanDirectory(binDir);
-
-        // clean tmp directory
-        File tmpDir = new File(PrefStore.getTmpDir(c));
-        cleanDirectory(tmpDir);
-
         return true;
     }
 
@@ -600,7 +556,7 @@ static boolean httpd(Context c, String cmd) {
                 params.add("export ENV_DIR=\"" + PrefStore.getEnvDir(c) + "\"");
                 params.add("export HOME=\"" + PrefStore.getEnvDir(c) + "\"");
                 params.add("cd " + PrefStore.getWebDir(c));
-                params.add("httpd " + " -p " + PrefStore.getHttpPort(c) + " -c " + PrefStore.getEtcDir(c) + "/httpd.conf");
+                params.add("httpd " + " -p " + PrefStore.getHttpPort(c) + " -c " + PrefStore.getEnvDir(c) + "/httpd.conf");
         }
         return params.size() > 0 && exec(c, "sh", params);
     }
@@ -615,7 +571,7 @@ private static boolean makeHttpdConf(Context c) {
         boolean result = false;
         BufferedWriter bw = null;
         try {
-            String f = PrefStore.getEtcDir(c) + "/httpd.conf";
+            String f = PrefStore.getEnvDir(c) + "/httpd.conf";
             bw = new BufferedWriter(new FileWriter(f));
             for (String part : PrefStore.getHttpConf(c).split(" ")) {
                 bw.write(part + "\n");

app/src/main/java/ru/meefik/linuxdeploy/EnvUtils.java

@@ -64,7 +64,7 @@ static String getDataDir(Context c) {
      * Get environment directory
      *
      * @param c context
-     * @return path, e.g. /data/data/package/files/env
+     * @return path, e.g. /data/data/package/env
      */
     static String getEnvDir(Context c) {
         String envDir = SETTINGS.get(c, "env_dir");
@@ -86,40 +86,30 @@ static String getConfigDir(Context c) {
      * Get bin directory
      *
      * @param c context
-     * @return path, e.g. /data/data/package/bin
+     * @return path, e.g. ${ENV_DIR}/bin
      */
     static String getBinDir(Context c) {
-        return getDataDir(c) + "/bin";
-    }
-
-    /**
-     * Get etc directory
-     *
-     * @param c context
-     * @return path, e.g. /data/data/package/etc
-     */
-    static String getEtcDir(Context c) {
-        return getDataDir(c) + "/etc";
+        return getEnvDir(c) + "/bin";
     }
 
     /**
      * Get tmp directory
      *
      * @param c context
-     * @return path, e.g. /data/data/package/tmp
+     * @return path, e.g. ${ENV_DIR}/tmp
      */
     static String getTmpDir(Context c) {
-        return getDataDir(c) + "/tmp";
+        return getEnvDir(c) + "/tmp";
     }
 
     /**
      * Get web directory
      *
      * @param c context
-     * @return path, e.g. /data/data/package/web
+     * @return path, e.g. ${ENV_DIR}/web
      */
     static String getWebDir(Context c) {
-        return getDataDir(c) + "/web";
+        return getEnvDir(c) + "/web";
     }
 
     /**
@@ -421,10 +411,10 @@ static Boolean isStealth(Context c) {
      * Get PATH variable
      *
      * @param c context
-     * @return path, e.g. /data/data/package/files/bin
+     * @return path, e.g. ${ENV_DIR}/bin
      */
     static String getPath(Context c) {
-        String binDir = getDataDir(c) + "/bin";
+        String binDir = getBinDir(c);
         String path = SETTINGS.get(c, "path");
         if (path.isEmpty()) path = binDir;
         else path = path + ":" + binDir;