Bump version to 0.48

In versions of Android earlier than 7.0 the FLAG_ACTIVITY_NEW_TASK
is needed when starting an activity from a non-activity context.

This was removed in Android 7.0 (possibly by mistake), see
https://code.google.com/p/android/issues/detail?id=226647.

Fixes #802

.gitignore

@@ -6,6 +6,7 @@
 build/
 *.apk
 *.so
+.externalNativeBuild
 
 # Crashlytics configuations
 com_crashlytics_export_strings.xml

.idea/gradle.xml

@@ -12,12 +12,7 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="myModules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.travis.yml

@@ -6,16 +6,20 @@ env:
   global:
     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
     # via the "travis encrypt" command using the project repo's public key
-    - secure: "ACnFJxw0VusS2lnGXL+epP/CNJmftWS39YcPdgN2EurWw5ZfXSo7vi+zpMB+11IBS3LQyLFFUambi2N9L4lbReZkHVkoVcZFGZlwbXNTAeqT8CABPTcuOyEOZU4bJwqeYU87ztYipENMLNECaZrgWx5odbWLKnSJQw7Zkb4ArCstfXfYk9u8q49ThRxQyGwHW2xKp1an5aa+3Y6IY+ywsSHw6AvXbyFH078Kolxy86caagczcfmKcMi15QYzwAvFggUphvsO3M5PHJMQXuaNlQxDcQRGUEXsK8aZE0dPH5PB97SFjDALZqI7NEpjZAk5htWjX48ssW064LDbjcBg/ZLgDd8R8uhA159NVZgvcnP2czCn6pmggx1sW5MBmcj7i+bJS2ejaMO+KoovWlVvsch742H5QR6rQaNkjDZRsGVLYvJaR1gBLs898UoT1hcHWoqLVR22r2VFo7OWWCRfNRvZuZDR2HIrYRdFvn8P3nWVMkvXwgsOlxWG5sN+yQqW+6lZS7hivsFhtYs4CkRdoZIan3Qvi/CkY8Lg+ESkZ3IJ0NnId8qOWH+8Xl1sqZ7xlsWTd1sYYHlpvkdvqw1HNLP22EpwwKW5Kb5zBEd/qs3o1OO0Tqa0MR6JpgGdHHRk1iZ25+qTfRVP06vO2RXsgAx4SZfO7DyB0QZn8tGNMMI="
+    - secure: "LdajbHNfRlpnqzhX5KY2Vr7KtzU9vXDs1TCNn93J6Dt522f2AaiyUDJvISvz+uslk0WJiS5bB5vGwQmXginxz6Qi6uMgMbjWXulv1vfs6ZviKpUX348DOp1qKPa8WfVNB66F84SwGIfc8cRMAgCFw79l/DFgLErubF8vKo1wZ8Hmvrz//+RJ0BGMa3YRc4VyJhAL0P+0Wc1Q2Im7R9EovAxC5pZXBIMSgr6g5GzLWPisbNLXpMPGsDeYhcenO6XCtCCy+aNxUYM8vcrLDzlVXR5Hy7KEs/MGRTS0Yk13TWUEYa5wBpKelFTszdWYLVn5ANreh/aXRVfHpnW3epotMYguLx1kSvOhWEnc4F+qqv3nle2LpDg9Y9bcLyTTcYnPl9smqEVVjEDu0FoIr1V58xkG4Oc6BPIvLRjlMVU96PXh2HxMLuGsJ/xM+uAFU9oVMbC07xn42Eu5O4NHOHJNOwMWac4/lSKRK8W/7/vWuXj5vhkD9ZsGVpN70UtY5HAfNUGADnTeDblvjgFTNZ2mUN/u0o7Z8ZFURYllZ9YU+Vr2nPf9CAhVBjuwFWx8uRQpAg1aDmc1dVMJijRBeBeU/uWhYqsGp34wkNEl8VGzob4R4QTyI8+T7CndGqKVmbTK/SjqKhjjPpbXIAfOH+JtxvAnNmb8XeQSJ32uK2nexFo="
 
 android:
   components:
     - platform-tools
     - tools
-    - build-tools-24.0.1
-    - android-24
+    - build-tools-25.0.2
+    - android-25
     - extra-android-m2repository
 
+before_install:
+  - git clone https://github.com/urho3d/android-ndk.git $HOME/android-ndk
+  - export ANDROID_NDK_HOME=$HOME/android-ndk
+
 script:
   - ./gradlew testDebugUnitTest
 
@@ -26,5 +30,5 @@ addons:
       description: "Terminal emulator and Linux environment for Android"
     notification_email: fredrik@fornwall.net
     build_command_prepend: "./gradlew clean"
-    build_command: "./gradlew assemble"
-    branch_pattern: coverity_scan
+    build_command: "./gradlew build"
+    branch_pattern: master

README.md

@@ -3,25 +3,19 @@ Termux app
 [![Travis build status](https://travis-ci.org/termux/termux-app.svg?branch=master)](https://travis-ci.org/termux/termux-app)
 [![Join the chat at https://gitter.im/termux/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux/termux)
 
-
-Termux is an Android terminal app and Linux environment.
+[Termux](https://termux.com) is an Android terminal app and Linux environment.
 
 * [Termux on Google Play Store](https://play.google.com/store/apps/details?id=com.termux)
 * [Termux on F-Droid](https://f-droid.org/repository/browse/?fdid=com.termux)
-* [termux.com](http://termux.com)
 * [Termux Help](http://termux.com/help/)
-* [Termux app on GitHub](https://github.com/termux/termux-app)
-* [Termux packages on GitHub](https://github.com/termux/termux-packages)
 * [Termux Google+ community](http://termux.com/community/)
 
+Note that this repository is for the app itself (the user interface and the terminal emulation). For the packages installable inside the app, see [termux/termux-packages](https://github.com/termux/termux-packages)
+
 License
 =======
 Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html). Contains code from `Terminal Emulator for Android` which is released under [the Apache License 2.0](https://www.apache.org/licenses/).
 
-Building JNI libraries
-======================
-Execute the `build-jnilibs.sh` script to build the required JNI libraries.
-
 Terminal resources
 ==================
 * [XTerm control sequences](http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)

app/build.gradle

@@ -1,25 +1,29 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     dependencies {
-        compile 'com.android.support:support-annotations:24.2.0'
-        compile "com.android.support:support-v4:24.2.0"
+        compile 'com.android.support:support-annotations:25.1.0'
+        compile "com.android.support:support-v4:25.1.0"
     }
 
     defaultConfig {
         applicationId "com.termux"
         minSdkVersion 21
-        targetSdkVersion 24
-        versionCode 42
-        versionName "0.42"
+        targetSdkVersion 25
+        versionCode 48
+        versionName "0.48"
+
+        externalNativeBuild {
+            ndkBuild {
+                cFlags "-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections"
+            }
+        }
 
         ndk {
-            moduleName "libtermux"
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-            cFlags "-std=c11 -Wall -Wextra -Os -fno-stack-protector -nostdlib -Wl,--gc-sections"
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
         }
     }
 
@@ -30,6 +34,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    externalNativeBuild {
+        ndkBuild {
+            path "src/main/jni/Android.mk"
+        }
+    }
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -15,7 +15,8 @@
     <application
         android:allowBackup="true"
         android:fullBackupContent="@xml/backupscheme"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:banner="@drawable/banner"
         android:label="@string/application_name"
         android:theme="@style/Theme.Termux"
@@ -34,6 +35,7 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />
         </activity>
 
         <activity
@@ -88,6 +90,14 @@
             android:name="com.termux.app.TermuxService"
             android:exported="false" />
 
+        <receiver android:name=".app.TermuxOpenReceiver" />
+
+        <provider android:authorities="com.termux.files"
+                  android:readPermission="android.permission.permRead"
+                  android:exported="true"
+                  android:grantUriPermissions="true"
+                  android:name="com.termux.app.TermuxOpenReceiver$ContentProvider" />
+
     </application>
 
 </manifest>

app/src/main/java/com/termux/app/BackgroundJob.java

@@ -4,58 +4,71 @@ import android.util.Log;
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * A background job launched by Termux.
  */
 public final class BackgroundJob {
 
-    private static final String LOG_TAG = "termux-background";
+    private static final String LOG_TAG = "termux-task";
 
     final Process mProcess;
 
-    public BackgroundJob(File cwd, File fileToExecute, String[] args) throws IOException {
-        String[] env = buildEnvironment(false, cwd.getAbsolutePath());
+    public BackgroundJob(String cwd, String fileToExecute, final String[] args, final TermuxService service) {
+        String[] env = buildEnvironment(false, cwd);
+        if (cwd == null) cwd = TermuxService.HOME_PATH;
 
-        String[] progArray = new String[args.length + 1];
+        final String[] progArray = setupProcessArgs(fileToExecute, args);
+        final String processDescription = Arrays.toString(progArray);
 
-        mProcess = Runtime.getRuntime().exec(progArray, env, cwd);
-
-        new Thread() {
-            @Override
-            public void run() {
-                while (true) {
-                    try {
-                        int exitCode = mProcess.waitFor();
-                        if (exitCode == 0) {
-                            Log.i(LOG_TAG, "exited normally");
-                            return;
-                        } else {
-                            Log.i(LOG_TAG, "exited with exit code: " + exitCode);
-                        }
-                    } catch (InterruptedException e) {
-                        // Ignore.
-                    }
-                }
-            }
-        }.start();
+        Process process;
+        try {
+            process = Runtime.getRuntime().exec(progArray, env, new File(cwd));
+        } catch (IOException e) {
+            mProcess = null;
+            // TODO: Visible error message?
+            Log.e(LOG_TAG, "Failed running background job: " + processDescription, e);
+            return;
+        }
+
+        mProcess = process;
+        final int pid = getPid(mProcess);
 
         new Thread() {
             @Override
             public void run() {
+                Log.i(LOG_TAG, "[" + pid + "] starting: " + processDescription);
                 InputStream stdout = mProcess.getInputStream();
                 BufferedReader reader = new BufferedReader(new InputStreamReader(stdout, StandardCharsets.UTF_8));
                 String line;
                 try {
                     // FIXME: Long lines.
                     while ((line = reader.readLine()) != null) {
-                        Log.i(LOG_TAG, line);
+                        Log.i(LOG_TAG, "[" + pid + "] stdout: " + line);
                     }
                 } catch (IOException e) {
+                    Log.e(LOG_TAG, "Error reading output", e);
+                }
+
+                try {
+                    int exitCode = mProcess.waitFor();
+                    service.onBackgroundJobExited(BackgroundJob.this);
+                    if (exitCode == 0) {
+                        Log.i(LOG_TAG, "[" + pid + "] exited normally");
+                    } else {
+                        Log.w(LOG_TAG, "[" + pid + "] exited with code: " + exitCode);
+                    }
+                } catch (InterruptedException e) {
                     // Ignore.
                 }
             }
@@ -71,7 +84,7 @@ public final class BackgroundJob {
                 try {
                     // FIXME: Long lines.
                     while ((line = reader.readLine()) != null) {
-                        Log.e(LOG_TAG, line);
+                        Log.i(LOG_TAG, "[" + pid + "] stderr: " + line);
                     }
                 } catch (IOException e) {
                     // Ignore.
@@ -80,7 +93,7 @@ public final class BackgroundJob {
         };
     }
 
-    public String[] buildEnvironment(boolean failSafe, String cwd) {
+    public static String[] buildEnvironment(boolean failSafe, String cwd) {
         new File(TermuxService.HOME_PATH).mkdirs();
 
         if (cwd == null) cwd = TermuxService.HOME_PATH;
@@ -93,7 +106,6 @@ public final class BackgroundJob {
         // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
         // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
         final String externalStorageEnv = "EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE");
-        String[] env;
         if (failSafe) {
             // Keep the default path so that system binaries can be used in the failsafe session.
             final String pathEnv = "PATH=" + System.getenv("PATH");
@@ -109,4 +121,73 @@ public final class BackgroundJob {
         }
     }
 
+    public static int getPid(Process p) {
+        try {
+            Field f = p.getClass().getDeclaredField("pid");
+            f.setAccessible(true);
+            try {
+                return f.getInt(p);
+            } finally {
+                f.setAccessible(false);
+            }
+        } catch (Throwable e) {
+            return -1;
+        }
+    }
+
+    static String[] setupProcessArgs(String fileToExecute, String[] args) {
+        // The file to execute may either be:
+        // - An elf file, in which we execute it directly.
+        // - A script file without shebang, which we execute with our standard shell $PREFIX/bin/sh instead of the
+        //   system /system/bin/sh. The system shell may vary and may not work at all due to LD_LIBRARY_PATH.
+        // - A file with shebang, which we try to handle with e.g. /bin/foo -> $PREFIX/bin/foo.
+        String interpreter = null;
+        try {
+            File file = new File(fileToExecute);
+            try (FileInputStream in = new FileInputStream(file)) {
+                byte[] buffer = new byte[256];
+                int bytesRead = in.read(buffer);
+                if (bytesRead > 4) {
+                    if (buffer[0] == 0x7F && buffer[1] == 'E' && buffer[2] == 'L' && buffer[3] == 'F') {
+                        // Elf file, do nothing.
+                    } else if (buffer[0] == '#' && buffer[1] == '!') {
+                        // Try to parse shebang.
+                        StringBuilder builder = new StringBuilder();
+                        for (int i = 2; i < bytesRead; i++) {
+                            char c = (char) buffer[i];
+                            if (c == ' ' || c == '\n') {
+                                if (builder.length() == 0) {
+                                    // Skip whitespace after shebang.
+                                    continue;
+                                } else {
+                                    // End of shebang.
+                                    String executable = builder.toString();
+                                    if (executable.startsWith("/usr") || executable.startsWith("/bin")) {
+                                        String[] parts = executable.split("/");
+                                        String binary = parts[parts.length - 1];
+                                        interpreter = TermuxService.PREFIX_PATH + "/bin/" + binary;
+                                    }
+                                    break;
+                                }
+                            } else {
+                                builder.append(c);
+                            }
+                        }
+                    } else {
+                        // No shebang and no ELF, use standard shell.
+                        interpreter = TermuxService.PREFIX_PATH + "/bin/sh";
+                    }
+                }
+            }
+        } catch (IOException e) {
+            // Ignore.
+        }
+
+        List<String> result = new ArrayList<>();
+        if (interpreter != null) result.add(interpreter);
+        result.add(fileToExecute);
+        if (args != null) Collections.addAll(result, args);
+        return result.toArray(new String[result.size()]);
+    }
+
 }

app/src/main/java/com/termux/app/TermuxActivity.java

@@ -49,6 +49,8 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -248,7 +250,9 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                             TerminalSession session = getCurrentTermSession();
                             if (session != null) {
                                 if (session.isRunning()) {
-                                    session.write(editText.getText().toString() + "\n");
+                                    String textToSend = editText.getText().toString();
+                                    if (textToSend.length() == 0) textToSend = "\n";
+                                    session.write(textToSend);
                                 } else {
                                     removeFinishedSession(session);
                                 }
@@ -402,20 +406,20 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
             @Override
             public void onBell(TerminalSession session) {
-                if (mIsVisible) {
-                    switch (mSettings.mBellBehaviour) {
-                        case TermuxPreferences.BELL_BEEP:
-                            mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
-                            break;
-                        case TermuxPreferences.BELL_VIBRATE:
-                            ((Vibrator) getSystemService(VIBRATOR_SERVICE)).vibrate(50);
-                            break;
-                        case TermuxPreferences.BELL_IGNORE:
-                            // Ignore the bell character.
-                            break;
-                    }
+                if (!mIsVisible) return;
 
+                switch (mSettings.mBellBehaviour) {
+                    case TermuxPreferences.BELL_BEEP:
+                        mBellSoundPool.play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
+                        break;
+                    case TermuxPreferences.BELL_VIBRATE:
+                        ((Vibrator) getSystemService(VIBRATOR_SERVICE)).vibrate(50);
+                        break;
+                    case TermuxPreferences.BELL_IGNORE:
+                        // Ignore the bell character.
+                        break;
                 }
+
             }
 
             @Override
@@ -429,8 +433,9 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             final StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
             final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC);
 
+            @NonNull
             @Override
-            public View getView(int position, View convertView, ViewGroup parent) {
+            public View getView(int position, View convertView, @NonNull ViewGroup parent) {
                 View row = convertView;
                 if (row == null) {
                     LayoutInflater inflater = getLayoutInflater();
@@ -491,17 +496,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                     public void run() {
                         if (mTermService == null) return; // Activity might have been destroyed.
                         try {
-                            if (TermuxPreferences.isShowWelcomeDialog(TermuxActivity.this)) {
-                                new AlertDialog.Builder(TermuxActivity.this).setTitle(R.string.welcome_dialog_title).setMessage(R.string.welcome_dialog_body)
-                                    .setCancelable(false).setPositiveButton(android.R.string.ok, null)
-                                    .setNegativeButton(R.string.welcome_dialog_dont_show_again_button, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            TermuxPreferences.disableWelcomeDialog(TermuxActivity.this);
-                                            dialog.dismiss();
-                                        }
-                                    }).show();
-                            }
                             addNewSession(false, null);
                         } catch (WindowManager.BadTokenException e) {
                             // Activity finished - ignore.
@@ -513,7 +507,13 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                 finish();
             }
         } else {
-            switchToSession(getStoredCurrentSessionOrLast());
+            Intent i = getIntent();
+            if (i != null && Intent.ACTION_RUN.equals(i.getAction())) {
+                // Android 7.1 app shortcut from res/xml/shortcuts.xml.
+                addNewSession(false, null);
+            } else {
+                switchToSession(getStoredCurrentSessionOrLast());
+            }
         }
     }
 
@@ -534,6 +534,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             @Override
             public void onTextSet(String text) {
                 sessionToRename.mSessionName = text;
+                mListViewAdapter.notifyDataSetChanged();
             }
         }, -1, null, -1, null, null);
     }

app/src/main/java/com/termux/app/TermuxInstaller.java

@@ -257,9 +257,13 @@ final class TermuxInstaller {
                     Os.symlink(moviesDir.getAbsolutePath(), new File(storageDir, "movies").getAbsolutePath());
 
                     final File[] dirs = context.getExternalFilesDirs(null);
-                    if (dirs != null && dirs.length >= 2) {
-                        final File externalDir = dirs[1];
-                        Os.symlink(externalDir.getAbsolutePath(), new File(storageDir, "external").getAbsolutePath());
+                    if (dirs != null && dirs.length > 1) {
+                        for (int i = 1; i < dirs.length; i++) {
+                            File dir = dirs[i];
+                            if (dir == null) continue;
+                            String symlinkName = "external-" + i;
+                            Os.symlink(dir.getAbsolutePath(), new File(storageDir, symlinkName).getAbsolutePath());
+                        }
                     }
                 } catch (Exception e) {
                     Log.e(LOG_TAG, "Error setting up link", e);

app/src/main/java/com/termux/app/TermuxOpenReceiver.java

@@ -0,0 +1,172 @@
+package com.termux.app;
+
+import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.provider.MediaStore;
+import android.util.Log;
+import android.webkit.MimeTypeMap;
+
+import com.termux.terminal.EmulatorDebug;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+
+public class TermuxOpenReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final Uri data = intent.getData();
+        if (data == null) {
+            Log.e(EmulatorDebug.LOG_TAG, "termux-open: Called without intent data");
+            return;
+        }
+
+        final boolean isExternalUrl = data.getScheme() != null && !data.getScheme().equals("file");
+        if (isExternalUrl) {
+            Intent viewIntent = new Intent(Intent.ACTION_VIEW, data);
+            viewIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            try {
+                context.startActivity(viewIntent);
+            } catch (ActivityNotFoundException e) {
+                Log.e(EmulatorDebug.LOG_TAG, "termux-open: No app handles the url " + data);
+            }
+            return;
+        }
+
+        final String filePath = data.getPath();
+        final String contentTypeExtra = intent.getStringExtra("content-type");
+        final boolean useChooser = intent.getBooleanExtra("chooser", false);
+        final String intentAction = intent.getAction() == null ? Intent.ACTION_VIEW : intent.getAction();
+
+        switch (intentAction) {
+            case Intent.ACTION_SEND:
+            case Intent.ACTION_VIEW:
+                // Ok.
+                break;
+            default:
+                Log.e(EmulatorDebug.LOG_TAG, "Invalid action '" + intentAction + "', using 'view'");
+                break;
+        }
+
+        final File fileToShare = new File(filePath);
+        if (!(fileToShare.isFile() && fileToShare.canRead())) {
+            Log.e(EmulatorDebug.LOG_TAG, "termux-open: Not a readable file: '" + fileToShare.getAbsolutePath() + "'");
+            return;
+        }
+
+        Intent sendIntent = new Intent();
+        sendIntent.setAction(intentAction);
+        sendIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+        String contentTypeToUse;
+        if (contentTypeExtra == null) {
+            String fileName = fileToShare.getName();
+            int lastDotIndex = fileName.lastIndexOf('.');
+            String fileExtension = fileName.substring(lastDotIndex + 1, fileName.length());
+            MimeTypeMap mimeTypes = MimeTypeMap.getSingleton();
+            // Lower casing makes it work with e.g. "JPG":
+            contentTypeToUse = mimeTypes.getMimeTypeFromExtension(fileExtension.toLowerCase());
+            if (contentTypeToUse == null) contentTypeToUse = "application/octet-stream";
+        } else {
+            contentTypeToUse = contentTypeExtra;
+        }
+
+        Uri uriToShare = Uri.withAppendedPath(Uri.parse("content://com.termux.files/"), filePath);
+
+        if (Intent.ACTION_SEND.equals(intentAction)) {
+            sendIntent.putExtra(Intent.EXTRA_STREAM, uriToShare);
+            sendIntent.setType(contentTypeToUse);
+        } else {
+            sendIntent.setDataAndType(uriToShare, contentTypeToUse);
+        }
+
+        if (useChooser) {
+            sendIntent = Intent.createChooser(sendIntent, null).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+
+        try {
+            context.startActivity(sendIntent);
+        } catch (ActivityNotFoundException e) {
+            Log.e(EmulatorDebug.LOG_TAG, "termux-open: No app handles the url " + data);
+        }
+    }
+
+    public static class ContentProvider extends android.content.ContentProvider {
+
+        @Override
+        public boolean onCreate() {
+            return true;
+        }
+
+        @Override
+        public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+            File file = new File(uri.getPath());
+
+            if (projection == null) {
+                projection = new String[]{
+                    MediaStore.MediaColumns.DISPLAY_NAME,
+                    MediaStore.MediaColumns.SIZE,
+                    MediaStore.MediaColumns._ID
+                };
+            }
+
+            Object[] row = new Object[projection.length];
+            for (int i = 0; i < projection.length; i++) {
+                String column = projection[i];
+                Object value;
+                switch (column) {
+                    case MediaStore.MediaColumns.DISPLAY_NAME:
+                        value = file.getName();
+                        break;
+                    case MediaStore.MediaColumns.SIZE:
+                        value = (int) file.length();
+                        break;
+                    case MediaStore.MediaColumns._ID:
+                        value = 1;
+                        break;
+                    default:
+                        value = null;
+                }
+                row[i] = value;
+            }
+
+            MatrixCursor cursor = new MatrixCursor(projection);
+            cursor.addRow(row);
+            return cursor;
+        }
+
+        @Override
+        public String getType(Uri uri) {
+            return null;
+        }
+
+        @Override
+        public Uri insert(Uri uri, ContentValues values) {
+            return null;
+        }
+
+        @Override
+        public int delete(Uri uri, String selection, String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
+            File file = new File(uri.getPath());
+            return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
+        }
+    }
+
+}

app/src/main/java/com/termux/app/TermuxPreferences.java

@@ -36,7 +36,6 @@ final class TermuxPreferences {
     private static final String SHOW_EXTRA_KEYS_KEY = "show_extra_keys";
     private static final String FONTSIZE_KEY = "fontsize";
     private static final String CURRENT_SESSION_KEY = "current_session";
-    private static final String SHOW_WELCOME_DIALOG_KEY = "intro_dialog";
 
     private boolean mFullScreen;
     private int mFontSize;
@@ -105,7 +104,7 @@ final class TermuxPreferences {
     }
 
     static void storeCurrentSession(Context context, TerminalSession session) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(TermuxPreferences.CURRENT_SESSION_KEY, session.mHandle).commit();
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(TermuxPreferences.CURRENT_SESSION_KEY, session.mHandle).apply();
     }
 
     static TerminalSession getCurrentSession(TermuxActivity context) {
@@ -117,14 +116,6 @@ final class TermuxPreferences {
         return null;
     }
 
-    public static boolean isShowWelcomeDialog(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SHOW_WELCOME_DIALOG_KEY, true);
-    }
-
-    public static void disableWelcomeDialog(Context context) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(SHOW_WELCOME_DIALOG_KEY, false).apply();
-    }
-
     public void reloadFromProperties(Context context) {
         try {
             File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");

app/src/main/java/com/termux/app/TermuxService.java

@@ -11,8 +11,10 @@ import android.content.res.Resources;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Binder;
+import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
+import android.support.v4.content.WakefulBroadcastReceiver;
 import android.util.Log;
 import android.widget.ArrayAdapter;
 
@@ -22,7 +24,6 @@ import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSession.SessionChangedCallback;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,18 +49,16 @@ public final class TermuxService extends Service implements SessionChangedCallba
 
     private static final int NOTIFICATION_ID = 1337;
 
-    /** Intent action to stop the service. */
     private static final String ACTION_STOP_SERVICE = "com.termux.service_stop";
-    /** Intent action to toggle the wake lock, {@link #mWakeLock}, which this service may hold. */
-    private static final String ACTION_LOCK_WAKE = "com.termux.service_toggle_wake_lock";
-    /** Intent action to toggle the wifi lock, {@link #mWifiLock}, which this service may hold. */
-    private static final String ACTION_LOCK_WIFI = "com.termux.service_toggle_wifi_lock";
+    private static final String ACTION_LOCK_WAKE = "com.termux.service_wake_lock";
+    private static final String ACTION_UNLOCK_WAKE = "com.termux.service_wake_unlock";
     /** Intent action to launch a new terminal session. Executed from TermuxWidgetProvider. */
     public static final String ACTION_EXECUTE = "com.termux.service_execute";
 
     public static final String EXTRA_ARGUMENTS = "com.termux.execute.arguments";
 
     public static final String EXTRA_CURRENT_WORKING_DIRECTORY = "com.termux.execute.cwd";
+    private static final String EXTRA_EXECUTE_IN_BACKGROUND = "com.termux.execute.background";
 
     /** This service is only bound from inside the same process and never uses IPC. */
     class LocalBinder extends Binder {
@@ -68,6 +67,8 @@ public final class TermuxService extends Service implements SessionChangedCallba
 
     private final IBinder mBinder = new LocalBinder();
 
+    private final Handler mHandler = new Handler();
+
     /**
      * The terminal sessions which this service manages.
      * <p/>
@@ -76,9 +77,12 @@ public final class TermuxService extends Service implements SessionChangedCallba
      */
     final List<TerminalSession> mTerminalSessions = new ArrayList<>();
 
+    final List<BackgroundJob> mBackgroundTasks = new ArrayList<>();
+
     /** Note that the service may often outlive the activity, so need to clear this reference. */
     SessionChangedCallback mSessionChangeCallback;
 
+    /** The wake lock and wifi lock are always acquired and released together. */
     private PowerManager.WakeLock mWakeLock;
     private WifiManager.WifiLock mWifiLock;
 
@@ -99,45 +103,60 @@ public final class TermuxService extends Service implements SessionChangedCallba
                 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
                 mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, EmulatorDebug.LOG_TAG);
                 mWakeLock.acquire();
-            } else {
-                mWakeLock.release();
-                mWakeLock = null;
-            }
-            updateNotification();
-        } else if (ACTION_LOCK_WIFI.equals(action)) {
-            if (mWifiLock == null) {
+
                 WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE);
                 mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, EmulatorDebug.LOG_TAG);
                 mWifiLock.acquire();
-            } else {
+
+                updateNotification();
+            }
+        } else if (ACTION_UNLOCK_WAKE.equals(action)) {
+            if (mWakeLock != null) {
+                mWakeLock.release();
+                mWakeLock = null;
+
                 mWifiLock.release();
                 mWifiLock = null;
+
+                updateNotification();
             }
-            updateNotification();
         } else if (ACTION_EXECUTE.equals(action)) {
             Uri executableUri = intent.getData();
             String executablePath = (executableUri == null ? null : executableUri.getPath());
+
             String[] arguments = (executableUri == null ? null : intent.getStringArrayExtra(EXTRA_ARGUMENTS));
             String cwd = intent.getStringExtra(EXTRA_CURRENT_WORKING_DIRECTORY);
-            TerminalSession newSession = createTermSession(executablePath, arguments, cwd, false);
 
-            // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".
-            if (executablePath != null) {
-                int lastSlash = executablePath.lastIndexOf('/');
-                String name = (lastSlash == -1) ? executablePath : executablePath.substring(lastSlash + 1);
-                name = name.replace('-', ' ');
-                newSession.mSessionName = name;
+            if (intent.getBooleanExtra(EXTRA_EXECUTE_IN_BACKGROUND, false)) {
+                BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this);
+                mBackgroundTasks.add(task);
+                updateNotification();
+            } else {
+                TerminalSession newSession = createTermSession(executablePath, arguments, cwd, false);
+
+                // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".
+                if (executablePath != null) {
+                    int lastSlash = executablePath.lastIndexOf('/');
+                    String name = (lastSlash == -1) ? executablePath : executablePath.substring(lastSlash + 1);
+                    name = name.replace('-', ' ');
+                    newSession.mSessionName = name;
+                }
+
+                // Make the newly created session the current one to be displayed:
+                TermuxPreferences.storeCurrentSession(this, newSession);
+
+                // Launch the main Termux app, which will now show the current session:
+                startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
             }
-
-            // Make the newly created session the current one to be displayed:
-            TermuxPreferences.storeCurrentSession(this, newSession);
-
-            // Launch the main Termux app, which will now show to current session:
-            startActivity(new Intent(this, TermuxActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
         } else if (action != null) {
             Log.e(EmulatorDebug.LOG_TAG, "Unknown TermuxService action: '" + action + "'");
         }
 
+        if ((flags & START_FLAG_REDELIVERY) == 0) {
+            // Service is started by WBR, not restarted by system, so release the WakeLock from WBR.
+            WakefulBroadcastReceiver.completeWakefulIntent(intent);
+        }
+
         // If this service really do get killed, there is no point restarting it automatically - let the user do on next
         // start of {@link Term):
         return Service.START_NOT_STICKY;
@@ -155,8 +174,8 @@ public final class TermuxService extends Service implements SessionChangedCallba
 
     /** Update the shown foreground service notification after making any changes that affect it. */
     private void updateNotification() {
-        if (mWakeLock == null && mWifiLock == null && getSessions().isEmpty()) {
-            // Exit if we are updating after the user disabled all locks with no sessions.
+        if (mWakeLock == null && mTerminalSessions.isEmpty() && mBackgroundTasks.isEmpty()) {
+            // Exit if we are updating after the user disabled all locks with no sessions or tasks running.
             stopSelf();
         } else {
             ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).notify(NOTIFICATION_ID, buildNotification());
@@ -171,18 +190,15 @@ public final class TermuxService extends Service implements SessionChangedCallba
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notifyIntent, 0);
 
         int sessionCount = mTerminalSessions.size();
-        String contentText = sessionCount + " terminal session" + (sessionCount == 1 ? "" : "s");
-
-        boolean wakeLockHeld = mWakeLock != null;
-        boolean wifiLockHeld = mWifiLock != null;
-        if (wakeLockHeld && wifiLockHeld) {
-            contentText += " (wake&wifi lock held)";
-        } else if (wakeLockHeld) {
-            contentText += " (wake lock held)";
-        } else if (wifiLockHeld) {
-            contentText += " (wifi lock held)";
+        int taskCount = mBackgroundTasks.size();
+        String contentText = sessionCount + " session" + (sessionCount == 1 ? "" : "s");
+        if (taskCount > 0) {
+            contentText += ", " + taskCount + " task" + (taskCount == 1 ? "" : "s");
         }
 
+        final boolean wakeLockHeld = mWakeLock != null;
+        if (wakeLockHeld) contentText += " (wake lock held)";
+
         Notification.Builder builder = new Notification.Builder(this);
         builder.setContentTitle(getText(R.string.application_name));
         builder.setContentText(contentText);
@@ -192,7 +208,7 @@ public final class TermuxService extends Service implements SessionChangedCallba
 
         // If holding a wake or wifi lock consider the notification of high priority since it's using power,
         // otherwise use a minimal priority since this is just a background service notification:
-        builder.setPriority((wakeLockHeld || wifiLockHeld) ? Notification.PRIORITY_HIGH : Notification.PRIORITY_MIN);
+        builder.setPriority((wakeLockHeld) ? Notification.PRIORITY_HIGH : Notification.PRIORITY_MIN);
 
         // No need to show a timestamp:
         builder.setShowWhen(false);
@@ -204,13 +220,13 @@ public final class TermuxService extends Service implements SessionChangedCallba
         Intent exitIntent = new Intent(this, TermuxService.class).setAction(ACTION_STOP_SERVICE);
         builder.addAction(android.R.drawable.ic_delete, res.getString(R.string.notification_action_exit), PendingIntent.getService(this, 0, exitIntent, 0));
 
-        Intent toggleWakeLockIntent = new Intent(this, TermuxService.class).setAction(ACTION_LOCK_WAKE);
-        builder.addAction(android.R.drawable.ic_lock_lock, res.getString(R.string.notification_action_wakelock),
-            PendingIntent.getService(this, 0, toggleWakeLockIntent, 0));
-
-        Intent toggleWifiLockIntent = new Intent(this, TermuxService.class).setAction(ACTION_LOCK_WIFI);
-        builder.addAction(android.R.drawable.ic_lock_lock, res.getString(R.string.notification_action_wifilock),
-            PendingIntent.getService(this, 0, toggleWifiLockIntent, 0));
+        String newWakeAction = wakeLockHeld ? ACTION_UNLOCK_WAKE : ACTION_LOCK_WAKE;
+        Intent toggleWakeLockIntent = new Intent(this, TermuxService.class).setAction(newWakeAction);
+        String actionTitle = res.getString(wakeLockHeld ?
+            R.string.notification_action_wake_unlock :
+            R.string.notification_action_wake_lock);
+        int actionIcon = wakeLockHeld ? android.R.drawable.ic_lock_idle_lock : android.R.drawable.ic_lock_lock;
+        builder.addAction(actionIcon, actionTitle, PendingIntent.getService(this, 0, toggleWakeLockIntent, 0));
 
         return builder.build();
     }
@@ -236,53 +252,15 @@ public final class TermuxService extends Service implements SessionChangedCallba
 
         if (cwd == null) cwd = HOME_PATH;
 
-        final String termEnv = "TERM=xterm-256color";
-        final String homeEnv = "HOME=" + HOME_PATH;
-        final String prefixEnv = "PREFIX=" + PREFIX_PATH;
-        final String androidRootEnv = "ANDROID_ROOT=" + System.getenv("ANDROID_ROOT");
-        final String androidDataEnv = "ANDROID_DATA=" + System.getenv("ANDROID_DATA");
-        // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
-        // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
-        final String externalStorageEnv = "EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE");
-        String[] env;
-        if (failSafe) {
-            // Keep the default path so that system binaries can be used in the failsafe session.
-            final String pathEnv = "PATH=" + System.getenv("PATH");
-            env = new String[]{termEnv, homeEnv, prefixEnv, androidRootEnv, androidDataEnv, pathEnv, externalStorageEnv};
-        } else {
-            final String ps1Env = "PS1=$ ";
-            final String ldEnv = "LD_LIBRARY_PATH=" + PREFIX_PATH + "/lib";
-            final String langEnv = "LANG=en_US.UTF-8";
-            final String pathEnv = "PATH=" + PREFIX_PATH + "/bin:" + PREFIX_PATH + "/bin/applets";
-            final String pwdEnv = "PWD=" + cwd;
+        String[] env = BackgroundJob.buildEnvironment(failSafe, cwd);
+        boolean isLoginShell = false;
 
-            env = new String[]{termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv, externalStorageEnv};
-        }
-
-        String shellName;
         if (executablePath == null) {
-            File shell = new File(HOME_PATH, ".termux/shell");
-            if (shell.exists()) {
-                try {
-                    File canonicalFile = shell.getCanonicalFile();
-                    if (canonicalFile.isFile() && canonicalFile.canExecute()) {
-                        executablePath = canonicalFile.getName().equals("busybox") ? (PREFIX_PATH + "/bin/ash") : canonicalFile.getAbsolutePath();
-                    } else {
-                        Log.w(EmulatorDebug.LOG_TAG, "$HOME/.termux/shell points to non-executable shell: " + canonicalFile.getAbsolutePath());
-                    }
-                } catch (IOException e) {
-                    Log.e(EmulatorDebug.LOG_TAG, "Error checking $HOME/.termux/shell", e);
-                }
-            }
-
-            if (executablePath == null) {
-                // Try bash, zsh and ash in that order:
-                for (String shellBinary : new String[]{"bash", "zsh", "ash"}) {
-                    File shellFile = new File(PREFIX_PATH + "/bin/" + shellBinary);
-                    if (shellFile.canExecute()) {
-                        executablePath = shellFile.getAbsolutePath();
-                        break;
-                    }
+            for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
+                File shellFile = new File(PREFIX_PATH + "/bin/" + shellBinary);
+                if (shellFile.canExecute()) {
+                    executablePath = shellFile.getAbsolutePath();
+                    break;
                 }
             }
 
@@ -290,23 +268,18 @@ public final class TermuxService extends Service implements SessionChangedCallba
                 // Fall back to system shell as last resort:
                 executablePath = "/system/bin/sh";
             }
-
-            String[] parts = executablePath.split("/");
-            shellName = "-" + parts[parts.length - 1];
-        } else {
-            int lastSlashIndex = executablePath.lastIndexOf('/');
-            shellName = lastSlashIndex == -1 ? executablePath : executablePath.substring(lastSlashIndex + 1);
+            isLoginShell = true;
         }
 
-        String[] args;
-        if (arguments == null) {
-            args = new String[]{shellName};
-        } else {
-            args = new String[arguments.length + 1];
-            args[0] = shellName;
+        String[] processArgs = BackgroundJob.setupProcessArgs(executablePath, arguments);
+        executablePath = processArgs[0];
+        int lastSlashIndex = executablePath.lastIndexOf('/');
+        String processName = (isLoginShell ? "-" : "") +
+            (lastSlashIndex == -1 ? executablePath : executablePath.substring(lastSlashIndex + 1));
 
-            System.arraycopy(arguments, 0, args, 1, arguments.length);
-        }
+        String[] args = new String[processArgs.length];
+        args[0] = processName;
+        if (processArgs.length > 1) System.arraycopy(processArgs, 1, args, 1, processArgs.length - 1);
 
         TerminalSession session = new TerminalSession(executablePath, cwd, args, env, this);
         mTerminalSessions.add(session);
@@ -358,4 +331,13 @@ public final class TermuxService extends Service implements SessionChangedCallba
         if (mSessionChangeCallback != null) mSessionChangeCallback.onColorsChanged(session);
     }
 
+    public void onBackgroundJobExited(final BackgroundJob task) {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                mBackgroundTasks.remove(task);
+                updateNotification();
+            }
+        });
+    }
 }

app/src/main/java/com/termux/filepicker/TermuxDocumentsProvider.java

@@ -75,7 +75,7 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
         row.add(Root.COLUMN_TITLE, applicationName);
         row.add(Root.COLUMN_MIME_TYPES, ALL_MIME_TYPES);
         row.add(Root.COLUMN_AVAILABLE_BYTES, BASE_DIR.getFreeSpace());
-        row.add(Root.COLUMN_ICON, R.drawable.ic_launcher);
+        row.add(Root.COLUMN_ICON, R.mipmap.ic_launcher);
         return result;
     }
 
@@ -236,7 +236,7 @@ public class TermuxDocumentsProvider extends DocumentsProvider {
         row.add(Document.COLUMN_MIME_TYPE, mimeType);
         row.add(Document.COLUMN_LAST_MODIFIED, file.lastModified());
         row.add(Document.COLUMN_FLAGS, flags);
-        row.add(Document.COLUMN_ICON, R.drawable.ic_launcher);
+        row.add(Document.COLUMN_ICON, R.mipmap.ic_launcher);
     }
 
 }

app/src/main/java/com/termux/terminal/TerminalColorScheme.java

@@ -57,7 +57,7 @@ public final class TerminalColorScheme {
         0xff808080, 0xff8a8a8a, 0xff949494, 0xff9e9e9e, 0xffa8a8a8, 0xffb2b2b2, 0xffbcbcbc, 0xffc6c6c6, 0xffd0d0d0, 0xffdadada, 0xffe4e4e4, 0xffeeeeee,
 
         // COLOR_INDEX_DEFAULT_FOREGROUND, COLOR_INDEX_DEFAULT_BACKGROUND and COLOR_INDEX_DEFAULT_CURSOR:
-        0xffffffff, 0xff000000, 0xffffffff};
+        0xffffffff, 0xff000000, 0xffA9AAA9};
 
     public final int[] mDefaultColors = new int[TextStyle.NUM_INDEXED_COLORS];
 

app/src/main/java/com/termux/terminal/TerminalEmulator.java

@@ -722,7 +722,6 @@ public final class TerminalEmulator {
                         }
                         break;
                     case ESC_PERCENT:
-                        Log.i(EmulatorDebug.LOG_TAG, "Ignoring character set sequence 'ESC % " + (char) b + "'");
                         break;
                     case ESC_OSC:
                         doOsc(b);

app/src/main/java/com/termux/terminal/TerminalSession.java

@@ -123,12 +123,12 @@ public final class TerminalSession extends TerminalOutput {
                 String exitDescription = "\r\n[Process completed";
                 if (exitCode > 0) {
                     // Non-zero process exit.
-                    exitDescription += " with code " + exitCode;
+                    exitDescription += " (code " + exitCode + ")";
                 } else if (exitCode < 0) {
                     // Negated signal.
-                    exitDescription += " with signal " + (-exitCode);
+                    exitDescription += " (signal " + (-exitCode) + ")";
                 }
-                exitDescription += " - press Enter to close]";
+                exitDescription += " - press Enter]";
 
                 byte[] bytesToWrite = exitDescription.getBytes(StandardCharsets.UTF_8);
                 mEmulator.append(bytesToWrite, bytesToWrite.length);

app/src/main/java/com/termux/view/TerminalRenderer.java

@@ -54,7 +54,8 @@ final class TerminalRenderer {
     }
 
     /** Render the terminal to a canvas with at a specified row scroll, and an optional rectangular selection. */
-    public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow, int selectionY1, int selectionY2, int selectionX1, int selectionX2) {
+    public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
+                             int selectionY1, int selectionY2, int selectionX1, int selectionX2) {
         final boolean reverseVideo = mEmulator.isReverseVideo();
         final int endRow = topRow + mEmulator.mRows;
         final int columns = mEmulator.mColumns;
@@ -63,6 +64,7 @@ final class TerminalRenderer {
         final boolean cursorVisible = mEmulator.isShowingCursor();
         final TerminalBuffer screen = mEmulator.getScreen();
         final int[] palette = mEmulator.mColors.mCurrentColors;
+        final int cursorShape = mEmulator.getCursorStyle();
 
         if (reverseVideo)
             canvas.drawColor(palette[TextStyle.COLOR_INDEX_FOREGROUND], PorterDuff.Mode.SRC);
@@ -113,8 +115,10 @@ final class TerminalRenderer {
                     } else {
                         final int columnWidthSinceLastRun = column - lastRunStartColumn;
                         final int charsSinceLastRun = currentCharIndex - lastRunStartIndex;
-                        drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun, lastRunStartIndex, charsSinceLastRun,
-                            measuredWidthForRun, lastRunInsideCursor, lastRunStyle, reverseVideo);
+                        int cursorColor = lastRunInsideCursor ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
+                        drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun,
+                            lastRunStartIndex, charsSinceLastRun, measuredWidthForRun,
+                            cursorColor, cursorShape, lastRunStyle, reverseVideo);
                     }
                     measuredWidthForRun = 0.f;
                     lastRunStyle = style;
@@ -135,37 +139,42 @@ final class TerminalRenderer {
 
             final int columnWidthSinceLastRun = columns - lastRunStartColumn;
             final int charsSinceLastRun = currentCharIndex - lastRunStartIndex;
+            int cursorColor = lastRunInsideCursor ? mEmulator.mColors.mCurrentColors[TextStyle.COLOR_INDEX_CURSOR] : 0;
             drawTextRun(canvas, line, palette, heightOffset, lastRunStartColumn, columnWidthSinceLastRun, lastRunStartIndex, charsSinceLastRun,
-                measuredWidthForRun, lastRunInsideCursor, lastRunStyle, reverseVideo);
+                measuredWidthForRun, cursorColor, cursorShape, lastRunStyle, reverseVideo);
         }
     }
 
-    /**
-     * @param canvas          the canvas to render on
-     * @param palette         the color palette to look up colors from textStyle
-     * @param y               height offset into the canvas where to render the line: line * {@link #mFontLineSpacing}
-     * @param startColumn     the run offset in columns
-     * @param runWidthColumns the run width in columns - this is computed from wcwidth() and may not be what the font measures to
-     * @param text            the java char array to render text from
-     * @param startCharIndex  index into the text array where to start
-     * @param runWidthChars   number of java characters from the text array to render
-     * @param cursor          true if rendering a cursor or selection
-     * @param textStyle       the background, foreground and effect encoded using {@link TextStyle}
-     * @param reverseVideo    if the screen is rendered with the global reverse video flag set
-     */
-    private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int startColumn, int runWidthColumns, int startCharIndex, int runWidthChars,
-                             float mes, boolean cursor, long textStyle, boolean reverseVideo) {
+    private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int startColumn, int runWidthColumns,
+                             int startCharIndex, int runWidthChars, float mes, int cursor, int cursorStyle,
+                             long textStyle, boolean reverseVideo) {
         int foreColor = TextStyle.decodeForeColor(textStyle);
+        final int effect = TextStyle.decodeEffect(textStyle);
         int backColor = TextStyle.decodeBackColor(textStyle);
+        final boolean bold = (effect & (TextStyle.CHARACTER_ATTRIBUTE_BOLD | TextStyle.CHARACTER_ATTRIBUTE_BLINK)) != 0;
+        final boolean underline = (effect & TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE) != 0;
+        final boolean italic = (effect & TextStyle.CHARACTER_ATTRIBUTE_ITALIC) != 0;
+        final boolean strikeThrough = (effect & TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH) != 0;
+        final boolean dim = (effect & TextStyle.CHARACTER_ATTRIBUTE_DIM) != 0;
 
-        int foreColorIndex = -1;
         if ((foreColor & 0xff000000) != 0xff000000) {
-            foreColorIndex = foreColor;
+            // Let bold have bright colors if applicable (one of the first 8):
+            if (bold && foreColor >= 0 && foreColor < 8) foreColor += 8;
             foreColor = palette[foreColor];
         }
-        if ((backColor & 0xff000000) != 0xff000000) backColor = palette[backColor];
 
-        final int effect = TextStyle.decodeEffect(textStyle);
+        if ((backColor & 0xff000000) != 0xff000000) {
+            backColor = palette[backColor];
+        }
+
+        // Reverse video here if _one and only one_ of the reverse flags are set:
+        final boolean reverseVideoHere = reverseVideo ^ (effect & (TextStyle.CHARACTER_ATTRIBUTE_INVERSE)) != 0;
+        if (reverseVideoHere) {
+            int tmp = foreColor;
+            foreColor = backColor;
+            backColor = tmp;
+        }
+
         float left = startColumn * mFontWidth;
         float right = left + runWidthColumns * mFontWidth;
 
@@ -179,32 +188,21 @@ final class TerminalRenderer {
             savedMatrix = true;
         }
 
-        // Reverse video here if _one and only one_ of the reverse flags are set:
-        boolean reverseVideoHere = reverseVideo ^ (effect & (TextStyle.CHARACTER_ATTRIBUTE_INVERSE)) != 0;
-        // Switch if _one and only one_ of reverse video and cursor is set:
-        if (reverseVideoHere ^ cursor) {
-            int tmp = foreColor;
-            foreColor = backColor;
-            backColor = tmp;
-        }
-
         if (backColor != palette[TextStyle.COLOR_INDEX_BACKGROUND]) {
             // Only draw non-default background.
             mTextPaint.setColor(backColor);
             canvas.drawRect(left, y - mFontLineSpacingAndAscent + mFontAscent, right, y, mTextPaint);
         }
 
+        if (cursor != 0) {
+            mTextPaint.setColor(cursor);
+            float cursorHeight = mFontLineSpacingAndAscent - mFontAscent;
+            if (cursorStyle == TerminalEmulator.CURSOR_STYLE_UNDERLINE) cursorHeight /= 4.;
+            else if (cursorStyle == TerminalEmulator.CURSOR_STYLE_BAR) right -= ((right - left) * 3) / 4.;
+            canvas.drawRect(left, y - cursorHeight, right, y, mTextPaint);
+        }
+
         if ((effect & TextStyle.CHARACTER_ATTRIBUTE_INVISIBLE) == 0) {
-            // Treat blink as bold:
-            final boolean bold = (effect & (TextStyle.CHARACTER_ATTRIBUTE_BOLD | TextStyle.CHARACTER_ATTRIBUTE_BLINK)) != 0;
-            final boolean underline = (effect & TextStyle.CHARACTER_ATTRIBUTE_UNDERLINE) != 0;
-            final boolean italic = (effect & TextStyle.CHARACTER_ATTRIBUTE_ITALIC) != 0;
-            final boolean strikeThrough = (effect & TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH) != 0;
-            final boolean dim = (effect & TextStyle.CHARACTER_ATTRIBUTE_DIM) != 0;
-
-            // Let bold have bright colors if applicable (one of the first 8):
-            if (bold && foreColorIndex >= 0 && foreColorIndex < 8) foreColor = palette[foreColorIndex + 8];
-
             if (dim) {
                 int red = (0xFF & (foreColor >> 16));
                 int green = (0xFF & (foreColor >> 8));

app/src/main/java/com/termux/view/TerminalView.java

@@ -238,8 +238,9 @@ public final class TerminalView extends View {
         // https://github.com/termux/termux-app/issues/137 (japanese chars and TYPE_NULL).
         outAttrs.inputType = InputType.TYPE_NULL;
 
-        // Let part of the application show behind when in landscape:
-        outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_FULLSCREEN;
+        // Note that IME_ACTION_NONE cannot be used as that makes it impossible to input newlines using the on-screen
+        // keyboard on Android TV (see https://github.com/termux/termux-app/issues/221).
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN;
 
         return new BaseInputConnection(this, true) {
 
@@ -270,16 +271,15 @@ public final class TerminalView extends View {
 
             @Override
             public boolean deleteSurroundingText(int leftLength, int rightLength) {
-                if (LOG_KEY_EVENTS)
+                if (LOG_KEY_EVENTS) {
                     Log.i(EmulatorDebug.LOG_TAG, "IME: deleteSurroundingText(" + leftLength + ", " + rightLength + ")");
-                // If leftLength=2 it may be due to a UTF-16 surrogate pair. So we cannot send
-                // multiple key events for that. Let's just hope that keyboards don't use
-                // leftLength > 1 for other purposes (such as holding down backspace for repeat).
-                sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
+                }
+                // The stock Samsung keyboard with 'Auto check spelling' enabled sends leftLength > 1.
+                KeyEvent deleteKey = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL);
+                for (int i = 0; i < leftLength; i++) sendKeyEvent(deleteKey);
                 return super.deleteSurroundingText(leftLength, rightLength);
             }
 
-
             void sendTextToTerminal(CharSequence text) {
                 final int textLengthInChars = text.length();
                 for (int i = 0; i < textLengthInChars; i++) {
@@ -298,6 +298,14 @@ public final class TerminalView extends View {
 
                     boolean ctrlHeld = false;
                     if (codePoint <= 31 && codePoint != 27) {
+                        if (codePoint == '\n') {
+                            // The AOSP keyboard and descendants seems to send \n as text when the enter key is pressed,
+                            // instead of a key event like most other keyboard apps. A terminal expects \r for the enter
+                            // key (although when icrnl is enabled this doesn't make a difference - run 'stty -icrnl' to
+                            // check the behaviour).
+                            codePoint = '\r';
+                        }
+
                         // E.g. penti keyboard for ctrl input.
                         ctrlHeld = true;
                         switch (codePoint) {

app/src/main/jni/Android.mk

@@ -0,0 +1,5 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE:= libtermux
+LOCAL_SRC_FILES:= termux.c
+include $(BUILD_SHARED_LIBRARY)

app/src/main/res/drawable/ic_new_session.xml

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M 12, 12
+                          m -10.5, 0
+                          a 10.5,10.5 0 1,0 21,0
+                          a 10.5,10.5 0 1,0 -21,0"/>
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
+</vector>

app/src/main/res/drawable/ic_service_notification.xml

@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <!--
+        https://material.google.com/style/icons.html
+    -->
+
+    <!-- Screen border. -->
+    <path android:fillColor="#00000000"
+          android:strokeColor="#000"
+          android:strokeWidth="3"
+          android:pathData="M7,4
+                            l34,0
+                            q3 0,3 3
+                            l0,34
+                            q0 3, -3 3
+                            l-34,0
+                            q-3 0, -3-3
+                            l0 -34
+                            q0 -3, 3 -3"
+          />
+
+    <!-- Block cursor. -->
+    <path android:fillColor="#000"
+          android:pathData="M14,14
+                            l5,0
+                            l0,10
+                            l-5,0"
+        />
+
+</vector>

app/src/main/res/layout/extra_keys_right.xml

@@ -7,7 +7,6 @@
     android:imeOptions="actionSend|flagNoFullscreen"
     android:maxLines="1"
     android:inputType="text"
-    android:singleLine="true"
     android:textColor="@android:color/white"
     android:paddingTop="0dp"
     android:textCursorDrawable="@null"

app/src/main/res/values/strings.xml

@@ -11,10 +11,6 @@
    <string name="share_transcript_title">Terminal transcript</string>
    <string name="help">Help</string>
 
-   <string name="welcome_dialog_title">Welcome to Termux</string>
-   <string name="welcome_dialog_body">Long press and select <i>More…</i> to show a menu where <i>Help</i> is available.\n\nExecute <b>apt update</b> to update the packages list before installing packages.</string>
-   <string name="welcome_dialog_dont_show_again_button">Do not show again</string>
-
    <string name="bootstrap_installer_body">Installing…</string>
    <string name="bootstrap_error_title">Unable to install</string>
    <string name="bootstrap_error_body">Termux was unable to install the bootstrap packages.\n\nCheck your network connection and try again.</string>
@@ -50,8 +46,8 @@
   <string name="styling_install">Install</string>
 
   <string name="notification_action_exit">Exit</string>
-  <string name="notification_action_wakelock">Wake</string>
-  <string name="notification_action_wifilock">Wifi</string>
+  <string name="notification_action_wake_lock">Acquire wakelock</string>
+  <string name="notification_action_wake_unlock">Release wakelock</string>
 
   <string name="file_received_title">Save file in ~/downloads/</string>
   <string name="file_received_edit_button">Edit</string>

app/src/main/res/values/styles.xml

@@ -5,6 +5,7 @@
     <!-- NOTE: Cannot use "Light." since it hides the terminal scrollbar on the default black background. -->
     <style name="Theme.Termux" parent="@android:style/Theme.Material.Light.NoActionBar">
         <item name="android:statusBarColor">#000000</item>
+        <item name="android:colorPrimary">#FF000000</item>
         <item name="android:windowBackground">@android:color/black</item>
 
         <!-- Seen in buttons on left drawer: -->
@@ -13,6 +14,10 @@
         <!-- Avoid action mode toolbar pushing down terminal content when
              selecting text on pre-6.0 (non-floating toolbar). -->
         <item name="android:windowActionModeOverlay">true</item>
+
+        <!-- https://developer.android.com/training/tv/start/start.html#transition-color -->
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
     </style>
 
 	<style name="TermuxAlertDialogStyle" parent="@android:style/Theme.Material.Light.Dialog.Alert">

app/src/main/res/xml/shortcuts.xml

@@ -0,0 +1,14 @@
+<shortcuts xmlns:tools="http://schemas.android.com/tools"
+           xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:shortcutId="new_session"
+        android:enabled="true"
+        android:icon="@drawable/ic_new_session"
+        android:shortcutShortLabel="@string/new_session"
+        tools:targetApi="n_mr1">
+        <intent
+            android:action="android.intent.action.RUN"
+            android:targetPackage="com.termux"
+            android:targetClass="com.termux.app.TermuxActivity"/>
+    </shortcut>
+</shortcuts>

app/src/test/java/com/termux/terminal/WcWidthTest.java

@@ -19,6 +19,7 @@ public class WcWidthTest extends TestCase {
         assertWidthIs(1, 'å');
         assertWidthIs(1, 'ä');
         assertWidthIs(1, 'ö');
+        assertWidthIs(1, 0x23F2);
     }
 
 	public void testSomeWide() {
@@ -45,6 +46,7 @@ public class WcWidthTest extends TestCase {
 	public void testCombining() {
         assertWidthIs(0, 0x0302);
         assertWidthIs(0, 0x0308);
+        assertWidthIs(0, 0xFE0F);
     }
 
     public void testWordJoiner() {

art/copy-to-other-apps.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+for DENSITY in mdpi hdpi xhdpi xxhdpi xxxhdpi; do
+	FOLDER=../app/src/main/res/mipmap-$DENSITY
+
+	for FILE in ic_launcher ic_launcher_round; do
+		PNG=$FOLDER/$FILE.png
+
+		# Update other apps:
+		for APP in api boot styling tasker widget; do
+			APPDIR=../../termux-$APP
+			if [ -d $APPDIR ]; then
+				APP_FOLDER=$APPDIR/app/src/main/res/mipmap-$DENSITY
+				mkdir -p $APP_FOLDER
+				cp $PNG $APP_FOLDER/$FILE.png
+			fi
+		done
+	done
+
+done

art/feature-graphic.svg

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!--
+  This is a feature graphic:
+    https://support.google.com/googleplay/android-developer/answer/1078870
+  - 1024px by 500px, no alpha
+  - Don't include any copy or important visual information near the borders of the asset,
+    specifically near the bottom third of the frame.
+  - Try to center align any logo/copy information in the vertical and horizontal center of the frame.
+  - If adding text, use large font sizes.
+  - Your graphic may be displayed alone without the app icon.
+ -->
+<svg xmlns:svg="http://www.w3.org/2000/svg"
+     xmlns="http://www.w3.org/2000/svg"
+     version="1.1"
+     viewBox="0 0 1024 500">
+
+ <rect fill="#0" width="100%" height="100%" />
+
+ <text id="shell_prompt"
+       x="130"
+       y="330"
+       style="fill: #ffffff; font-size: 124px; font-family: Menlo;">
+       <!--
+   <tspan>$</tspan>
+   <tspan x="290">Termux</tspan>
+   <tspan x="734">█</tspan>
+   -->
+   <tspan>$ Termux █</tspan>
+ </text>
+
+</svg>

art/generate-feature-graphic.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "Generating feature graphics to ~/termux-icons/termux-feature-graphic.png..."
+mkdir -p ~/termux-icons/
+rsvg-convert feature-graphic.svg > ~/termux-icons/feature-graphic.png

art/generate-launcher-images.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+for DENSITY in mdpi hdpi xhdpi xxhdpi xxxhdpi; do
+	case $DENSITY in
+		mdpi) SIZE=48;;
+		hdpi) SIZE=72;;
+		xhdpi) SIZE=96;;
+		xxhdpi) SIZE=144;;
+		xxxhdpi) SIZE=192;;
+	esac
+
+	FOLDER=../app/src/main/res/mipmap-$DENSITY
+	mkdir -p $FOLDER
+
+	for FILE in ic_launcher ic_launcher_round; do
+		PNG=$FOLDER/$FILE.png
+		rsvg-convert -w $SIZE -h $SIZE $FILE.svg > $PNG
+		zopflipng -y $PNG $PNG
+	done
+done

art/generate-tv-banner.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "Generating feature graphics to ~/termux-icons/termux-feature-graphic.png..."
+mkdir -p ~/termux-icons/
+
+# The Android TV banner on google play (1280x720) has same aspect ratio
+# as the banner in the app (320x180).
+rsvg-convert -w 1280 -h 720 tv-banner.svg > ~/termux-icons/tv-banner.png
+rsvg-convert -w  320 -h 180 tv-banner.svg > ../app/src/main/res/drawable/banner.png

art/ic_launcher.svg

@@ -0,0 +1,26 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
+
+    <!-- Screen and border. -->
+    <path fill="#000"
+          stroke="#BFCBCD"
+          stroke-width="2"
+          d="M9,6
+             l30,0
+             q3 0,3 3
+             l0,30
+             q0 3, -3 3
+             l-30,0
+             q-3 0, -3-3
+             l0 -30
+             q0 -3, 3 -3"
+    />
+
+    <!-- Block cursor. -->
+    <path fill="#FFF"
+          d="M14,14
+             l5,0
+             l0,10
+             l-5,0"
+    />
+
+</svg>

art/ic_launcher_round.svg

@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
+
+    <!-- Screen and border. -->
+    <path fill="#000"
+          stroke="#BFCBCD"
+          stroke-width="2"
+          d="M 24, 24
+             m -21, 0
+             a 21,21 0 1,0 42,0
+             a 21,21 0 1,0 -42,0"
+    />
+
+    <!-- Block cursor. -->
+    <path fill="#FFF"
+          d="M15,15
+             l5,0
+             l0,10
+             l-5,0"
+    />
+
+</svg>

art/tv-banner.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!--
+  This is a tv banner graphic:
+    https://developer.android.com/design/tv/patterns.html#banner
+  - Size: 320 x 180 px, xhdpi resource in app
+  - Size: 1280 x 720 in google play.
+  - Text must be included in the image. If your app is available in more
+    than one language, you must provide versions of the banner image for each supported language.
+ -->
+<svg xmlns:svg="http://www.w3.org/2000/svg"
+     xmlns="http://www.w3.org/2000/svg"
+     version="1.1"
+     viewBox="0 0 1280 720">
+
+ <rect fill="#0" width="100%" height="100%" />
+
+ <text id="shell_prompt"
+       x="200"
+       y="410"
+       style="fill: #ffffff; font-size: 210px; font-family: Menlo, Monospace;">
+   <tspan>Termux  ▌</tspan>
+ </text>
+
+</svg>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 

gradle.properties

@@ -12,6 +12,4 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#Fri May 13 01:11:09 CEST 2016
 org.gradle.jvmargs=-Xmx2048M
-android.useDeprecatedNdk=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Jul 23 17:08:29 CEST 2016
+#Sun Dec 04 17:26:05 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega