Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions shell/tsu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,10 @@ unset LD_PRELOAD

## Build the environment
[[ -z "$_TSU_DEBUG" ]] || set +x
ENV_BUILT=""
ENV_BUILT=()

for key in "${!EXP_ENV[@]}"; do
ENV_BUILT="$ENV_BUILT $key=${EXP_ENV[$key]} "
ENV_BUILT+=("$key=${EXP_ENV[$key]}")
done
[[ -z "$_TSU_DEBUG" ]] || set -x

Expand Down Expand Up @@ -315,12 +315,13 @@ else
# Let's use the system toybox/toolbox for now
if [[ -n "$ENVIRONMENT_PRESERVE" ]]; then
su_args+=("--preserve-environment")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Useless when you use -p

su_cmdline="PATH=$ANDROID_SYSPATHS:$PATH $ENV_BUILT $STARTUP_SCRIPT "
path_for_system_env="PATH=$ANDROID_SYSPATHS:$PATH"
else
su_cmdline="PATH=$ANDROID_SYSPATHS env -i $ENV_BUILT $STARTUP_SCRIPT"
path_for_system_env="PATH=$ANDROID_SYSPATHS"
env_cmd="-i"
fi
su_args+=("-c")
exec "${su_args[@]}" "${su_cmdline}"
su_args+=("-ps")
exec env "$path_for_system_env" env "$env_cmd" "${ENV_BUILT[@]}" "${su_args[@]}" "$STARTUP_SCRIPT"
fi
done
fi
Expand Down