[gentoo-commits] proj/mozilla:master commit in: scripts/

[Ian Stakenvicius]

commit:     470f7cb82169d76ea8d463c212aa08e866dad3fb
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 03:02:53 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu May  5 03:02:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=470f7cb8

minor adjustments to two scripts

Added logic to abort if the ebuild specified as argument to generate_langpacks.sh
doesn't exist (typo in the path, etc)

Added another case to the MOZ_ESR check in verify_distfiles.sh to match properly in
older thunderbird-bin ebuilds

 scripts/generate_langpacks.sh | 2 +-
 scripts/verify_distfiles.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/generate_langpacks.sh b/scripts/generate_langpacks.sh
index 5032cdd..bbeb745 100755
--- a/scripts/generate_langpacks.sh
+++ b/scripts/generate_langpacks.sh
@@ -21,7 +21,7 @@ fi
 
 ebuild=${1}
 
-if [[ ${ebuild/.ebuild/} == ${ebuild} ]]; then
+if [[ ${ebuild/.ebuild/} == ${ebuild} ]] || [[ ! -e ${ebuild} ]]; then
   echo "Must specify the full path to the ebuild as arg.1"
 fi
 

diff --git a/scripts/verify_distfiles.sh b/scripts/verify_distfiles.sh
index 0cf2d68..d7fe77d 100755
--- a/scripts/verify_distfiles.sh
+++ b/scripts/verify_distfiles.sh
@@ -9,7 +9,7 @@ check_distfiles() {
 	local myver myname tmp
 	myname=$(qatom $1 |awk '{print $2}')
         mybasename=${myname/-bin/}
-	if grep 'MOZ_ESR=""' $1 &>/dev/null || [[ -n $(grep -L MOZ_ESR $1) ]] ; then
+	if grep -e 'MOZ_ESR=""' -e 'MOZ_ESR="0"' $1 &>/dev/null || [[ -n $(grep -L MOZ_ESR $1) ]] ; then
 		myver=$(qatom $1 |awk '{print $3}')
 	else
 		myver=$(qatom $1 |awk '{print $3 "esr"}')