@@ -47,7 +47,7 @@ IGNORE = None

 def register_ignores(ignores):

     global IGNORE

     if ignores:

-        IGNORE='^(' + '|'.join(ignores.split(',')) + ')'

+        IGNORE = '^(' + '|'.join(ignores.split(',')) + ')'

 def should_ignore(error):

@@ -64,11 +64,15 @@ def print_error(error, line):

 def not_continuation(line):

     return not re.search('\\\\$', line)

+

 def check_for_do(line):

     if not_continuation(line):

-        if re.search('^\s*for ', line):

+        match = re.match('^\s*(for|while|until)\s', line)

+        if match:

+            operator = match.group(1).strip()

             if not re.search(';\s*do(\b|$)', line):

-                print_error('E010: Do not on same line as for', line)

+                print_error('E010: Do not on same line as %s' % operator,

+                            line)

 def check_if_then(line):

@@ -71,8 +71,7 @@ MODE=""

 ROLE=Member

 USER_NAME=""

 USER_PASS=""

-while [ $# -gt 0 ]

-do

+while [ $# -gt 0 ]; do

     case "$1" in

     -h|--help) display_help; exit 0 ;;

     --os-username) export OS_USERNAME=$2; shift ;;

@@ -191,8 +191,7 @@ function wait_for_VM_to_halt() {

     domid=$(xe vm-list name-label="$GUEST_NAME" params=dom-id minimal=true)

     port=$(xenstore-read /local/domain/$domid/console/vnc-port)

     echo "vncviewer -via root@$mgmt_ip localhost:${port:2}"

-    while true

-    do

+    while true; do

         state=$(xe_min vm-list name-label="$GUEST_NAME" power-state=halted)

         if [ -n "$state" ]; then

             break

@@ -42,8 +42,7 @@ EOF

 get_params()

 {

-    while getopts "hbn:r:l:t:" OPTION;

-    do

+    while getopts "hbn:r:l:t:" OPTION; do

         case $OPTION in

             h) usage

                 exit 1