summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2019-07-16 14:14:48 +0200
committerValentin Rothberg <rothberg@redhat.com>2019-07-16 14:16:16 +0200
commit294ddc472047f5a13bcf1d9b41407e18b1fad984 (patch)
tree4eeb1e0b2c187645cb66733cc0445a085d9472e7
parent25d63f009dfb0bd646b761591a08989cfd9d4fda (diff)
downloadpodman-294ddc472047f5a13bcf1d9b41407e18b1fad984.tar.gz
podman-294ddc472047f5a13bcf1d9b41407e18b1fad984.tar.bz2
podman-294ddc472047f5a13bcf1d9b41407e18b1fad984.zip
dependency/analyses: simplify scripts
Credits to bash wizard @edsantiago for the changes. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
-rwxr-xr-xdependencies/analyses/dependency-tree.sh11
-rwxr-xr-xdependencies/analyses/nm-symbols-analysis.sh10
2 files changed, 6 insertions, 15 deletions
diff --git a/dependencies/analyses/dependency-tree.sh b/dependencies/analyses/dependency-tree.sh
index 9a2e3282d..84085a50d 100755
--- a/dependencies/analyses/dependency-tree.sh
+++ b/dependencies/analyses/dependency-tree.sh
@@ -5,16 +5,13 @@ if test "$#" -ne 1; then
exit 1
fi
-DATA=$(go list $1/... \
+go list $1/... \
| xargs -d '\n' go list -f '{{ .ImportPath }}: {{ join .Imports ", " }}' \
| awk '{ printf "%s\n\n", $0 }' \
- )
+ > direct-tree.tmp.$$ && mv -f direct-tree.tmp.$$ direct-tree.txt
-echo "$DATA" > direct-tree.txt
-DATA=$(go list $1/... \
+go list $1/... \
| xargs -d '\n' go list -f '{{ .ImportPath }}: {{ join .Deps ", " }}' \
| awk '{ printf "%s\n\n", $0 }' \
- )
-
-echo "$DATA" > transitive-tree.txt
+ > transitive-tree.tmp.$$ && mv -f transitive-tree.tmp.$$ transitive-tree.txt
diff --git a/dependencies/analyses/nm-symbols-analysis.sh b/dependencies/analyses/nm-symbols-analysis.sh
index 924246715..361b746e4 100755
--- a/dependencies/analyses/nm-symbols-analysis.sh
+++ b/dependencies/analyses/nm-symbols-analysis.sh
@@ -5,11 +5,5 @@ if test "$#" -ne 1; then
exit 1
fi
-DATA=$(go tool nm -size "$1" \
- | awk 'NF==4 {printf "%s\t%s\t%s\n", $2, $3, $4}' \
- | grep -v -P "\t_\t" \
- | grep -P "\tt\t" \
- | awk ' {printf "%s\t\t%s\n", $1, $3} ' \
- )
-
-echo "$DATA"
+go tool nm -size "$1" \
+ | awk 'NF==4 && $3=="t" {printf "%s\t\t%s\n", $2, $4}'