improved get_addr func

jakopako · jakopako · commit 0dec9be49650 · 2022-06-15T14:04:50.000+02:00
diff --git a/data/scripts/tinyproxy_wrapper.sh b/data/scripts/tinyproxy_wrapper.sh
@@ -7,7 +7,7 @@ until ip link show tun0 2>&1 | grep -qv "does not exist"; do
 done
 
 get_addr() {
-   ip a show dev "$1" | grep inet | cut -d " " -f 6 | cut -d "/" -f 1 | tr '\n' ' ' | cut -d " " -f 1
+   ip address show "$1" | grep 'inet ' | awk '{split($2, inet, "/"); print inet[1]}'
 } 
 
 addr_eth=${LISTEN_ON:-$(get_addr eth0)}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ until ip link show tun0 2>&1 \| grep -qv "does not exist"; do`
`7`	`7`	`done`
`8`	`8`
`9`	`9`	`get_addr() {`
`10`		`- ip a show dev "$1" \| grep inet \| cut -d " " -f 6 \| cut -d "/" -f 1 \| tr '\n' ' ' \| cut -d " " -f 1`
	`10`	`+ ip address show "$1" \| grep 'inet ' \| awk '{split($2, inet, "/"); print inet[1]}'`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`addr_eth=${LISTEN_ON:-$(get_addr eth0)}`