From 51a4d4a13b9c54f8a141980a08a120ab232e2193 Mon Sep 17 00:00:00 2001 From: RohitKushvaha01 Date: Wed, 26 Nov 2025 15:32:08 +0530 Subject: [PATCH 1/3] fix: use correct timezone --- src/plugins/terminal/scripts/init-alpine.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/plugins/terminal/scripts/init-alpine.sh b/src/plugins/terminal/scripts/init-alpine.sh index 010388ca1..98856b370 100644 --- a/src/plugins/terminal/scripts/init-alpine.sh +++ b/src/plugins/terminal/scripts/init-alpine.sh @@ -1,12 +1,10 @@ - - export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/share/bin:/usr/share/sbin:/usr/local/bin:/usr/local/sbin:/system/bin:/system/xbin:$PREFIX/local/bin export PS1="\[\e[38;5;46m\]\u\[\033[39m\]@localhost \[\033[39m\]\w \[\033[0m\]\\$ " export HOME=/home export TERM=xterm-256color -required_packages="bash command-not-found" +required_packages="bash command-not-found tzdata wget" missing_packages="" for pkg in $required_packages; do @@ -33,6 +31,19 @@ fi if [ "$1" = "--installing" ]; then + echo "Configuring timezone..." + + # Fetch timezone using wget + TZ=$(wget -qO- https://ipapi.co/timezone) + + if [ -n "$TZ" ] && [ -f "/usr/share/zoneinfo/$TZ" ]; then + ln -sf "/usr/share/zoneinfo/$TZ" /etc/localtime + echo "$TZ" > /etc/timezone + echo "Timezone set to: $TZ" + else + echo "Failed to detect timezone" + fi + mkdir -p "$PREFIX/.configured" echo "Installation completed." exit 0 @@ -118,6 +129,7 @@ fi chmod +x "$PREFIX/alpine/initrc" #actual souce +#everytime a terminal is started initrc will run "$PREFIX/axs" -c "bash --rcfile /initrc -i" else From b07939177e79c9a18b9ad2ba08a672fdfba7e86b Mon Sep 17 00:00:00 2001 From: RohitKushvaha01 Date: Sat, 29 Nov 2025 11:07:45 +0530 Subject: [PATCH 2/3] feat: inherit timezone from host --- src/plugins/terminal/scripts/init-alpine.sh | 9 +++------ src/plugins/terminal/src/android/TerminalService.java | 11 +++++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/plugins/terminal/scripts/init-alpine.sh b/src/plugins/terminal/scripts/init-alpine.sh index 98856b370..10014202c 100644 --- a/src/plugins/terminal/scripts/init-alpine.sh +++ b/src/plugins/terminal/scripts/init-alpine.sh @@ -33,13 +33,10 @@ fi if [ "$1" = "--installing" ]; then echo "Configuring timezone..." - # Fetch timezone using wget - TZ=$(wget -qO- https://ipapi.co/timezone) - - if [ -n "$TZ" ] && [ -f "/usr/share/zoneinfo/$TZ" ]; then + if [ -n "$ANDROID_TZ" ] && [ -f "/usr/share/zoneinfo/$ANDROID_TZ" ]; then ln -sf "/usr/share/zoneinfo/$TZ" /etc/localtime - echo "$TZ" > /etc/timezone - echo "Timezone set to: $TZ" + echo "$ANDROID_TZ" > /etc/timezone + echo "Timezone set to: $ANDROID_TZ" else echo "Failed to detect timezone" fi diff --git a/src/plugins/terminal/src/android/TerminalService.java b/src/plugins/terminal/src/android/TerminalService.java index d5f85ad93..f8e26c67f 100644 --- a/src/plugins/terminal/src/android/TerminalService.java +++ b/src/plugins/terminal/src/android/TerminalService.java @@ -26,6 +26,11 @@ import java.util.concurrent.Executors; import java.lang.reflect.Field; +import java.util.TimeZone; +import java.util.Map; +import java.util.HashMap; + + public class TerminalService extends Service { @@ -141,6 +146,9 @@ private void startProcess(String pid, String cmd, String alpine) { Map env = builder.environment(); env.put("PREFIX", getFilesDir().getAbsolutePath()); env.put("NATIVE_DIR", getApplicationInfo().nativeLibraryDir); + TimeZone tz = TimeZone.getDefault(); + String timezoneId = tz.getID(); + env.put("ANDROID_TZ", timezoneId); try { int target = getPackageManager().getPackageInfo(getPackageName(), 0).applicationInfo.targetSdkVersion; @@ -180,6 +188,9 @@ private void exec(String execId, String cmd, String alpine) { Map env = builder.environment(); env.put("PREFIX", getFilesDir().getAbsolutePath()); env.put("NATIVE_DIR", getApplicationInfo().nativeLibraryDir); + TimeZone tz = TimeZone.getDefault(); + String timezoneId = tz.getID(); + env.put("ANDROID_TZ", timezoneId); try { int target = getPackageManager().getPackageInfo(getPackageName(), 0).applicationInfo.targetSdkVersion; From 6d50c9c203ca5bf125379ba473bdf339184af1ec Mon Sep 17 00:00:00 2001 From: Rohit Kushvaha Date: Sat, 29 Nov 2025 16:33:59 +0530 Subject: [PATCH 3/3] Update init-alpine.sh --- src/plugins/terminal/scripts/init-alpine.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/terminal/scripts/init-alpine.sh b/src/plugins/terminal/scripts/init-alpine.sh index 10014202c..a574df658 100644 --- a/src/plugins/terminal/scripts/init-alpine.sh +++ b/src/plugins/terminal/scripts/init-alpine.sh @@ -34,7 +34,7 @@ if [ "$1" = "--installing" ]; then echo "Configuring timezone..." if [ -n "$ANDROID_TZ" ] && [ -f "/usr/share/zoneinfo/$ANDROID_TZ" ]; then - ln -sf "/usr/share/zoneinfo/$TZ" /etc/localtime + ln -sf "/usr/share/zoneinfo/$ANDROID_TZ" /etc/localtime echo "$ANDROID_TZ" > /etc/timezone echo "Timezone set to: $ANDROID_TZ" else