acolyterm

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

  1. env-shell
  2. Merge into trunk
Proposed by Larry Price
Status: Merged
Approved by: Christopher Townsend
Approved revision: 213
Merged at revision: 217
Proposed branch: lp:~larryprice/acolyterm/env-shell
Merge into: lp:acolyterm
Diff against target: 11 lines (+1/-1)
1 file modified
src/app/main.cpp (+1/-1)
To merge this branch: bzr merge lp:~larryprice/acolyterm/env-shell
Reviewer Review Type Date Requested Status
Christopher Townsend (community) Approve
Libertine CI Bot continuous-integration Approve
Review via email: mp+298804@code.launchpad.net

Commit message

Use $SHELL to determine available or preferred shell.

Description of the change

Use $SHELL to determine available or preferred shell.

To post a comment you must log in.
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

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)
Revision history for this message
Christopher Townsend (townsend) wrote :

Legit

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/main.cpp'
2--- src/app/main.cpp 2016-06-22 15:30:43 +0000
3+++ src/app/main.cpp 2016-06-30 16:21:08 +0000
4@@ -105,7 +105,7 @@
5 else
6 {
7 command = "pkexec";
8- commandArguments = QStringList({"--user", "$USER", "/bin/bash"});
9+ commandArguments = QStringList({"--user", "$USER", "$SHELL"});
10 view.engine()->rootContext()->setContextProperty("disableTabs", QVariant(false));
11 }
12

Subscribers

People subscribed via source and target branches

to all changes: