mirrors/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2025-07-07 21:45:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix Android CI (#6580)

Browse source 
* android CI: get termux user from emulator

* stat: fix android builds
This commit is contained in:
Justin Tracey 2024-07-18 03:45:00 -04:00 • committed by GitHub
parent 1659422b90
commit 5882304dcd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/uu/stat/src/stat.rs
View file

@ -4,9 +4,6 @@
// file that was distributed with this source code. // file that was distributed with this source code.
// spell-checker:ignore datetime // spell-checker:ignore datetime
#[cfg(target_os = "android")]
use uucore::error::UResult;
#[cfg(not(target_os = "android"))]
use uucore::error::{UResult, USimpleError}; use uucore::error::{UResult, USimpleError};
use clap::builder::ValueParser; use clap::builder::ValueParser;

25
util/android-commands.sh
View file

@ -119,6 +119,23 @@ take_screen_shot() {
adb exec-out screencap -p > "$filename" adb exec-out screencap -p > "$filename"
} }
get_app_user() {
app="$1"
app_user="$(adb shell dumpsys package $app | grep 'userId=' | cut -d= -f2 | sort -u)"
if [[ -z "$app_user" ]]; then
echo "Couldn't find user for app: $app">&2
exit 1
fi
echo "$app_user"
}
termux_user() {
if [[ -z "$TERMUX_USER" ]]; then
TERMUX_USER="$(get_app_user com.termux)"
fi
echo "$TERMUX_USER"
}
launch_termux() { launch_termux() {
echo "launching termux" echo "launching termux"
take_screen_shot "launch_termux_enter" take_screen_shot "launch_termux_enter"
@ -355,17 +372,17 @@ setup_ssh_forwarding() {
} }
copy_file_or_dir_to_device_via_ssh() { copy_file_or_dir_to_device_via_ssh() {
scp -r "$1" "scp://termux@127.0.0.1:9022/$2" scp -r "$1" "scp://$(termux_user)@127.0.0.1:9022/$2"
} }
copy_file_or_dir_from_device_via_ssh() { copy_file_or_dir_from_device_via_ssh() {
scp -r "scp://termux@127.0.0.1:9022/$1" "$2" scp -r "scp://$(termux_user)@127.0.0.1:9022/$1" "$2"
} }
# runs the in args provided command on android side via ssh. forwards return code. # runs the in args provided command on android side via ssh. forwards return code.
# adds a timestamp to every line to be able to see where delays are # adds a timestamp to every line to be able to see where delays are
run_command_via_ssh() { run_command_via_ssh() {
ssh -p 9022 termux:@127.0.0.1 -o StrictHostKeyChecking=accept-new "$@" 2>&1 | add_timestamp_to_lines ssh -p 9022 "$(termux_user)@127.0.0.1" -o StrictHostKeyChecking=accept-new "$@" 2>&1 | add_timestamp_to_lines
return "${PIPESTATUS[0]}" return "${PIPESTATUS[0]}"
} }
@ -376,7 +393,7 @@ test_ssh_connection() {
# takes a local (on runner side) script file and runs it via ssh on the virtual android device. forwards return code. # takes a local (on runner side) script file and runs it via ssh on the virtual android device. forwards return code.
# adds a timestamp to every line to be able to see where delays are # adds a timestamp to every line to be able to see where delays are
run_script_file_via_ssh() { run_script_file_via_ssh() {
ssh -p 9022 termux:@127.0.0.1 -o StrictHostKeyChecking=accept-new "bash -s" < "$1" 2>&1 | add_timestamp_to_lines ssh -p 9022 "$(termux_user)@127.0.0.1" -o StrictHostKeyChecking=accept-new "bash -s" < "$1" 2>&1 | add_timestamp_to_lines
return "${PIPESTATUS[0]}" return "${PIPESTATUS[0]}"
} }