Merge pull request #517 from StackStorm/fix/port

warrenvw · web-flow · commit 3fc79854bbd4 · 2017-10-25T16:16:11.000-07:00
Search for complete port, not partial
diff --git a/scripts/includes/common.sh b/scripts/includes/common.sh
@@ -74,7 +74,7 @@ function port_status() {
   #
   # Sample output:
   #   0.0.0.0:25000 7506/sshd
-  ret=$(sudo netstat -tunlp --inet | awk -v port=:$1 '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' || echo 'Unbound');
+  ret=$(sudo netstat -tunlp --inet | awk -v port=":$1$" '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' || echo 'Unbound');
   echo "$ret";
 }
 
diff --git a/scripts/st2bootstrap-deb.sh b/scripts/st2bootstrap-deb.sh
@@ -191,7 +191,7 @@ function port_status() {
   #
   # Sample output:
   #   0.0.0.0:25000 7506/sshd
-  ret=$(sudo netstat -tunlp --inet | awk -v port=:$1 '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' || echo 'Unbound');
+  ret=$(sudo netstat -tunlp --inet | awk -v port=":$1$" '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' || echo 'Unbound');
   echo "$ret";
 }
 
diff --git a/scripts/st2bootstrap-el6.sh b/scripts/st2bootstrap-el6.sh
@@ -186,7 +186,7 @@ function port_status() {
   #
   # Sample output:
   #   0.0.0.0:25000 7506/sshd
-  ret=$(sudo netstat -tunlp --inet | awk -v port=:$1 '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' || echo 'Unbound');
+  ret=$(sudo netstat -tunlp --inet | awk -v port=":$1$" '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' || echo 'Unbound');
   echo "$ret";
 }
 
diff --git a/scripts/st2bootstrap-el7.sh b/scripts/st2bootstrap-el7.sh
@@ -186,7 +186,7 @@ function port_status() {
   #
   # Sample output:
   #   0.0.0.0:25000 7506/sshd
-  ret=$(sudo netstat -tunlp --inet | awk -v port=:$1 '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' || echo 'Unbound');
+  ret=$(sudo netstat -tunlp --inet | awk -v port=":$1$" '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' || echo 'Unbound');
   echo "$ret";
 }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ function port_status() {`
`74`	`74`	`#`
`75`	`75`	`# Sample output:`
`76`	`76`	`# 0.0.0.0:25000 7506/sshd`
`77`		`- ret=$(sudo netstat -tunlp --inet \| awk -v port=:$1 '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' \|\| echo 'Unbound');`
	`77`	`+ ret=$(sudo netstat -tunlp --inet \| awk -v port=":$1$" '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' \|\| echo 'Unbound');`
`78`	`78`	`echo "$ret";`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ function port_status() {`
`191`	`191`	`#`
`192`	`192`	`# Sample output:`
`193`	`193`	`# 0.0.0.0:25000 7506/sshd`
`194`		`- ret=$(sudo netstat -tunlp --inet \| awk -v port=:$1 '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' \|\| echo 'Unbound');`
	`194`	`+ ret=$(sudo netstat -tunlp --inet \| awk -v port=":$1$" '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' \|\| echo 'Unbound');`
`195`	`195`	`echo "$ret";`
`196`	`196`	`}`
`197`	`197`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ function port_status() {`
`186`	`186`	`#`
`187`	`187`	`# Sample output:`
`188`	`188`	`# 0.0.0.0:25000 7506/sshd`
`189`		`- ret=$(sudo netstat -tunlp --inet \| awk -v port=:$1 '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' \|\| echo 'Unbound');`
	`189`	`+ ret=$(sudo netstat -tunlp --inet \| awk -v port=":$1$" '$4 ~ port && $6 ~ /LISTEN/ { print $4 " " $7 }' \|\| echo 'Unbound');`
`190`	`190`	`echo "$ret";`
`191`	`191`	`}`
`192`	`192`