Merge lp:~vorlon/phablet-tools/checkbashisms into lp:phablet-tools

[Steve Langasek]

phablet-screenshot: Fix a use of sed which while technically not a bashism, causes checkbashisms to be able to parse the file, resulting in a test failure. In the process, make the pipeline more robust with regards to the 'fbset' output across platforms.

checkbashisms fails on phablet-screenshot, which causes CI for phablet-tools
to fail. Not sure how the branch was allowed to get into this state, the
testsuite should be run at package build time and should have caught this
error (and if not the package build, then the previous CI run).

Anyway, this should fix the problem, and should thus unblock my other MP,
https://code.launchpad.net/~vorlon/phablet-tools/sane-adb-shells/+merge/213541

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:248
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~vorlon/phablet-tools/checkbashisms/+merge/213556/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/68

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/296/rebuild

review: Needs Fixing (continuous-integration)

[Sergio Schvezov (sergiusens)]

review: Approve

[lp:~vorlon/phablet-tools/checkbashisms]

249. By Steve Langasek on 2014-04-01

Drop changelog entry, will be autogenerated

=== modified file 'phablet-screenshot'
--- phablet-screenshot	2014-03-26 17:02:53 +0000
+++ phablet-screenshot	2014-04-01 01:34:37 +0000
@@ -173,7 +173,7 @@
     # Otherwise just dump the framebuffer
     # Set resolution and depth for device
     depth=8
-    size="$(adb shell fbset|grep ^mode|sed -e 's/^.* "//' -e 's/-.*$//')"
+    size="$(adb shell fbset|sed -n -e's/^mode.*\"\([0-9]\+x[0-9]\+\)[-\"].*$/\1/p')"
     device="$(get_device)"
     if [ -z "$size" ]; then
         echo "E: Resolution not found. Device is not supported."