openstack/project-config
Code Issues Proposed changes

Switch to using test -n

Browse Source 
Using the construct of x$var != x is unnecessary, and has been
unnecessary for quite some time. We trust our shell, so switch to
using test -n.

Change-Id: I8eea943e5b641ba3d8781212877da7ddec167a6c
This commit is contained in:
Steve Kowalik 2015-05-21 13:39:55 -07:00
parent 5140cb0832
commit f4a2c9802d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins/scripts/common_translation_update.sh
View File

@ -182,7 +182,7 @@ EOF
# in the commit msg.
change_info=`ssh -p 29418 proposal-bot@review.openstack.org gerrit query --current-patch-set status:open project:$FULL_PROJECT topic:transifex/translations owner:proposal-bot`
previous=`echo "$change_info" | grep "^ number:" | awk '{print $2}'`
if [ "x${previous}" != "x" ] ; then
if [ -n "$previous" ]; then
change_id=`echo "$change_info" | grep "^change" | awk '{print $2}'`
# Read returns a non zero value when it reaches EOF. Because we use a
# heredoc here it will always reach EOF and return a nonzero value.
@ -205,7 +205,7 @@ EOF
# update it will always get sniped out of the gate by another.
# It also helps, when you approve close to the time this job is
# run.
if [ "x${previous}" != "x" ] ; then
if [ -n "$previous" ]; then
# Use the JSON format since it is very compact and easy to grep
change_info=`ssh -p 29418 proposal-bot@review.openstack.org gerrit query --current-patch-set --format=JSON $change_id`
# Check for:

2
jenkins/scripts/propose_update.sh
View File

@ -76,7 +76,7 @@ for PROJECT in $(cat projects.txt); do
# commit msg.
change_info=$(ssh -p 29418 $USERNAME@review.openstack.org gerrit query --current-patch-set status:open project:$PROJECT topic:$TOPIC owner:$USERNAME branch:$BRANCH)
previous=$(echo "$change_info" | grep "^ number:" | awk '{print $2}')
if [ "x${previous}" != "x" ] ; then
if [ -n "$previous" ]; then
change_id=$(echo "$change_info" | grep "^change" | awk '{print $2}')
# read return a non zero value when it reaches EOF. Because we use a
# heredoc here it will always reach EOF and return a nonzero value.

2
tools/propose_projects_yaml_update.sh
View File

@ -28,7 +28,7 @@ change_id=""
# commit msg.
change_info=$(ssh -p 29418 $USERNAME@review.openstack.org gerrit query --current-patch-set status:open project:$PROJECT topic:$TOPIC owner:$USERNAME)
previous=$(echo "$change_info" | grep "^ number:" | awk '{print $2}')
if [ "x${previous}" != "x" ] ; then
if [ -n "$previous" ]; then
change_id=$(echo "$change_info" | grep "^change" | awk '{print $2}')
# read return a non zero value when it reaches EOF. Because we use a
# heredoc here it will always reach EOF and return a nonzero value.