From b768cda841093df2b334a06c8f75f1f952990dee Mon Sep 17 00:00:00 2001 From: Ziyang Zhou Date: Sun, 19 May 2024 17:39:24 +0800 Subject: [PATCH] refine debug script --- debug.sh | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/debug.sh b/debug.sh index f0b4f4e..3a9a46c 100755 --- a/debug.sh +++ b/debug.sh @@ -9,10 +9,7 @@ container: container id or container name while getopts ':h' option; do case "$option" in - h) - echo "$usage" - exit 0 - ;; + *) echo "$usage" ;exit 0;; esac done @@ -20,17 +17,17 @@ container=$1 if [[ -z "$container" ]]; then echo -n "Container name (leave empty if stopped):" - read container < /dev/tty + read -r container < /dev/tty fi echo "Collecting, please wait..." -tmp_dir=`mktemp -d` +tmp_dir=$(mktemp -d -t redroid-debug.XXXXXXXX) #echo "creating tmp dir: $tmp_dir" -cd $tmp_dir +cd "$tmp_dir" || exit 1 -{ cp /boot/config-`uname -r` ./ || zcat /proc/config.gz > config-`uname -r`; } &> /dev/null +{ cp /boot/config-"$(uname -r)" ./ || zcat /proc/config.gz > config-"$(uname -r)"; } &> /dev/null { grep binder /proc/filesystems; grep ashmem /proc/misc; } > drivers.txt @@ -51,14 +48,14 @@ dmesg -T > dmesg.txt docker info &> docker-info.txt if [[ -n $container ]]; then - docker exec $container ps -A &> ps.txt - docker exec $container logcat -d &> logcat.txt - docker exec $container logcat -d -b crash &> crash.txt - docker exec $container /vendor/bin/vainfo -a &> vainfo.txt - docker exec $container getprop &> getprop.txt - docker exec $container dumpsys &> dumpsys.txt + docker exec "$container" ps -A &> ps.txt + docker exec "$container" logcat -d &> logcat.txt + docker exec "$container" logcat -d -b crash &> crash.txt + docker exec "$container" /vendor/bin/vainfo -a &> vainfo.txt + docker exec "$container" getprop &> getprop.txt + docker exec "$container" dumpsys &> dumpsys.txt -<<'EOF' >network.txt docker exec -i $container sh +<<'EOF' >network.txt docker exec -i "$container" sh echo "************** ip a" ip a echo "************** ip rule" @@ -66,12 +63,12 @@ if [[ -n $container ]]; then echo;echo "************** ip r show table eth0" ip r list table eth0 EOF - docker container inspect $container &> container-inspect.txt - docker image inspect `docker container inspect -f '{{.Config.Image}}' $container` &> image-inspect.txt + docker container inspect "$container" &> container-inspect.txt + docker image inspect "$(docker container inspect -f '{{.Config.Image}}' "$container")" &> image-inspect.txt fi tmp_tar=${tmp_dir}.tgz -tar czf $tmp_tar $tmp_dir &> /dev/null +tar czf "$tmp_tar" "$tmp_dir" &> /dev/null echo echo "==================================="