Merge lp:~larryprice/acolyterm/env-shell into lp:acolyterm

[Larry Price]

Use $SHELL to determine available or preferred shell.

Use $SHELL to determine available or preferred shell.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:213
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/38/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/139
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/100
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/100
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/100
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/100
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/100
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/100
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/112/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/142
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/127
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/127
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/127
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/120
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/120/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/120
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/120/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/120
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/120/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/120
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/120/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/120
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/120/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/120
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/120/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-acolyterm-ci/38/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Legit

review: Approve

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2016-06-22 15:30:43 +0000
+++ src/app/main.cpp	2016-06-30 16:21:08 +0000
@@ -105,7 +105,7 @@
   else
   {
     command = "pkexec";
-    commandArguments = QStringList({"--user", "$USER", "/bin/bash"});
+    commandArguments = QStringList({"--user", "$USER", "$SHELL"});
     view.engine()->rootContext()->setContextProperty("disableTabs", QVariant(false));
   }