Merge lp:~nuclearbob/utah/posix-shell-scripts into lp:utah

[Max Brustkern]

After Oli's email, I thought it would be wise to remove bashisms from our scripts and make sure they're using sh in the bang line. We certainly don't have to stick to the indefinitely if we need bash, but all these changes were easy and should make us more in line with standards.

[Dimitri John Ledkov (xnox)]

On 15 March 2013 17:58, Max Brustkern <email address hidden> wrote:
> Max Brustkern has proposed merging lp:~nuclearbob/utah/posix-shell-scripts into lp:utah.
> echo "$@"
> @@ -28,7 +28,7 @@
> export AUTO=""
> fi
>
> -VMDIR=$(echo -e "import utah.config\nprint(utah.config.vmpath)" | python)
> +VMDIR=$(printf "import utah.config\nprint(utah.config.vmpath)" | python)

Although this is POSIX compliant, it's not "pythonic". What about this:

VMDIR=$(python -c "import utah.config; print(utah.config.vmpath)")

Despite python being whitespace significant language ';' still works
to bundles commands on the same line.

Unless I am missing something and python in the above pipe is something else...

[Javier Collado (javier.collado)]

I've run checkbashims against the modified scripts and didn't get any
error/warning, so everything should be fine.

Anyway, I second Dmitrijs comment.

review: Approve

[lp:~nuclearbob/utah/posix-shell-scripts]

836. By Max Brustkern on 2013-03-18

Using more pythonic commands per xnox

[Max Brustkern (nuclearbob)]

That should be addressed now. If nobody objects shortly, I'll go ahead and merge.

review: Needs Resubmitting

[Andy Doan (doanac)]

+1

=== modified file 'conf/utah/dns'
--- conf/utah/dns	2012-07-11 17:43:36 +0000
+++ conf/utah/dns	2013-03-18 12:28:26 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 if [ -f /etc/default/qemu-kvm ]; then
   . /etc/default/qemu-kvm

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-01 14:18:10 +0000
+++ debian/changelog	2013-03-18 12:28:26 +0000
@@ -1,3 +1,9 @@
+utah (0.9ubuntu2) precise; urgency=low
+
+  * Made all shell scripts POSIX-compliant
+
+ -- Max Brustkern <[e-mail]>  Fri, 15 Mar 2013 13:55:24 -0400
+
 utah (0.9ubuntu1) UNRELEASED; urgency=low
 
   [ Javier Collado ]

=== modified file 'debian/utah-client.postinst'
--- debian/utah-client.postinst	2012-08-15 11:09:03 +0000
+++ debian/utah-client.postinst	2013-03-18 12:28:26 +0000
@@ -1,8 +1,10 @@
-#!/bin/bash -e
-
-function configure
+#!/bin/sh
+
+set -e
+
+configure()
 {
-    function usersetup
+    usersetup()
     {
       # Sane defaults:
 

=== modified file 'debian/utah.postinst'
--- debian/utah.postinst	2012-12-12 19:05:59 +0000
+++ debian/utah.postinst	2013-03-18 12:28:26 +0000
@@ -1,6 +1,8 @@
-#!/bin/bash -e
-
-function configure
+#!/bin/sh
+
+set -e
+
+configure()
 {
     if [ -f "/etc/utah/dns" ]
     then
@@ -12,7 +14,7 @@
 
     if ! type -t dnssetup >/dev/null 2>&1
     then
-      function dnssetup
+      dnssetup()
       {
         # Check that interface is up and has address assigned to it
         interface_up=$(python<<EOD
@@ -25,7 +27,7 @@
 
 EOD
 )
-        if [ "${interface_up}" == "True" ]
+        if [ "${interface_up}" = "True" ]
         then
           # Get address assigned to the interface
           IP=$(python -c "import netifaces; \
@@ -45,7 +47,7 @@
       }
     fi
 
-    function usersetup
+    usersetup()
     {
       # Sane defaults:
 

=== modified file 'debian/utah.postrm'
--- debian/utah.postrm	2012-08-14 15:09:17 +0000
+++ debian/utah.postrm	2013-03-18 12:28:26 +0000
@@ -1,6 +1,8 @@
-#!/bin/bash -e
-
-function cleanup
+#!/bin/sh
+
+set -e
+
+cleanup()
 {
     if [ -f "/etc/utah/dns" ]
     then
@@ -9,7 +11,7 @@
 
     if ! type -t dnsteardown >/dev/null 2>&1
     then
-      function dnsteardown
+      dnsteardown()
       {
         if dpkg -s resolvconf >/dev/null 2>&1
         then

=== modified file 'examples/utah-user-setup.sh'
--- examples/utah-user-setup.sh	2012-12-12 19:05:59 +0000
+++ examples/utah-user-setup.sh	2013-03-18 12:28:26 +0000
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
-function keepgoing
+keepgoing()
 {
   echo "Going to run:"
   echo "$@"
@@ -28,7 +28,7 @@
   export AUTO=""
 fi
 
-VMDIR=$(echo -e "import utah.config\nprint(utah.config.vmpath)" | python)
+VMDIR=$(python -c "import utah.config; print(utah.config.vmpath)")
 if ! [ -d "$VMDIR" ]
 then
   CMD="mkdir -p \"$VMDIR\""
@@ -36,7 +36,7 @@
   keepgoing $CMD
 fi
 
-SSHKEY=$(echo -e "import utah.config\nprint(utah.config.sshprivatekey)" | python)
+SSHKEY=$(python -c "import utah.config; print(utah.config.sshprivatekey)")
 if ! [ -d "$(dirname "$SSHKEY")" ]
 then
   CMD="mkdir -p \"$(dirname "$SSHKEY")\""

=== modified file 'examples/utah_logs.sh'
--- examples/utah_logs.sh	2012-11-29 16:38:37 +0000
+++ examples/utah_logs.sh	2013-03-18 12:28:26 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set +e
 NAME=$(grep "^Running on machine:" log | sed 's/^Running on machine: //')