final_msg: clean up

diff --git a/final_msg b/final_msg
index a5e920dfa58120f2decf2917dbea042567f94e93..da9ec44271f720c8a76540ddc3941cada53d7c63 100755 (executable)
--- a/final_msg
+++ b/final_msg
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-. "$(dirname $0)/common.sh" ""
+tools_dir=$(dirname "$0")
+. "$tools_dir/common.sh" ""
 
 to="Linux Next Mailing List <linux-next@vger.kernel.org>"
 cc="Linux Kernel Mailing List <linux-kernel@vger.kernel.org>"
@@ -8,7 +9,7 @@ subject="linux-next: Tree for $(date --date "5 hours ago" '+%b %-d')"
 prev=$(git tag -l next-* | sort | tail -n 2 | head -n 1 | sed 's/next-//')
 nmc=$(git rev-list --no-merges --count origin/master..HEAD^)
 ss=$(git diff --shortstat -M -C origin/master..HEAD^)
-ntrees=$(wc -l <../etc/control)
+ntrees=$(grep -v -c '^#' "$CTRL_FILE")
 
 sed -i.bak -e 's/^\(Changes since\) [0-9]*:/\1 '"$prev"':/' \
     -e 's/^\(Non-merge commits .*:\) [0-9]*/\1 '"$nmc"'/'\
@@ -16,6 +17,6 @@ sed -i.bak -e 's/^\(Changes since\) [0-9]*:/\1 '"$prev"':/' \
     -e 's/^\(I am currently merging\) [0-9]* /\1 '"$ntrees"' /' \
     ../last_msg
 
-$(dirname $0)/send_email "$to" "$cc" "$subject" <../last_msg
+"$tools_dir/send_email" "$to" "$cc" "$subject" <../last_msg
 
 exit 0