Fixes .bashrc being overridden upon startup

chedim · Nov 22, 2023 · 473ec52 · 473ec52
1 parent ca58d50
commit 473ec52
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -70,7 +70,7 @@ android {
                     (gradle.startParameter.taskNames.any { it.contains("Release") } && splitAPKsForReleaseBuilds == "1"))
                 reset ()
                 include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-                universalApk true
+                universalApk false
             }
         }
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="internalOnly"
-    android:sharedUserId="${TERMUX_PACKAGE_NAME}"
+    package="com.termux"
     android:sharedUserLabel="@string/shared_user_label">
 
     <uses-feature

diff --git a/...ared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java b/...ared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java
@@ -187,7 +187,9 @@ public static void createHomeDir(@NonNull Context context, @NonNull HashMap<Stri
                 Logger.logErrorExtended(LOG_TAG, "Failed to create shell home directory\n" + error.toString());
             }
 
-            FileUtils.copyResourceToFile(context, R.raw.bashrc, homeDirectory + "/.bashrc", Charset.defaultCharset());
+            if (!FileUtils.directoryFileExists(homeDirectory + "/.bashrc", true)) {
+                FileUtils.copyResourceToFile(context, R.raw.bashrc, homeDirectory + "/.bashrc", Charset.defaultCharset());
+            }
             setupAppListCache(context, true);
         }
     }