Merge lp:~ogra/phablet-tools/phablet-tools-fix-phablet-shell into lp:phablet-tools

[Oliver Grawert]

'phablet-shell: only start/stop ssh if it is not already running, do not wipe authorized_keys (breaks the SDK) and instead only append the key if it is not there yet. make sure ~/.ssh exists before trying to do anything with it (LP: #1355286) (LP: #1337289) (LP: #1326805)

phablet-shell: only start/stop ssh if it is not already running, do not wipe authorized_keys (breaks the SDK) and instead only append the key if it is not there yet. make sure ~/.ssh exists before trying to do anything with it

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:310
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/388/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/69

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

review: Approve (continuous-integration)

[Benjamin Zeller (zeller-benjamin)]

Works for me:
I can now use phablet-shell and the SDK together

review: Approve

[Robert Bruce Park (robru)]

Mostly lgtm, check one inline comment below.

review: Needs Fixing

[lp:~ogra/phablet-tools/phablet-tools-fix-phablet-shell]

311. By Oliver Grawert on 2014-09-17

drop the chwoning of the ~/.ssh dir, it should have the right owner already

[Robert Bruce Park (robru)]

lgtm

review: Approve

[Oliver Grawert (ogra)]

i dropped teh chown since teh user is in any case correct, but i would like ot keep the chmod since if the .ssh dir or authorized_keys never existed they are created with wide open permissions

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:311
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/391/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/72

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

=== modified file 'phablet-shell'
--- phablet-shell	2014-08-15 12:47:01 +0000
+++ phablet-shell	2014-09-17 16:29:43 +0000
@@ -82,10 +82,13 @@
     adb shell "$CMD >/dev/null"
 }
 
+# if sshd is already runing, do not attempt to start it
+SSH_RUNNING="$(adb shell pgrep sshd)"
+
 # Start ssh on the device and use port forwarding to connect to it.
 # This means that we'll connect to the device through the USB cable
 # and won't depend on if the device has it's wifi configured or not.
-toggle_ssh true
+[ -n "$SSH_RUNNING" ] || toggle_ssh true
 
 for PORT in `seq 2222 2299`; do
     adb forward tcp:$PORT tcp:22 && break
@@ -99,10 +102,18 @@
 
 # Copy your ssh id down to the device so you never need a password.
 NEWEST_KEY=$(ls -t ~/.ssh/*.pub | grep -v -- -cert.pub | head -1)
-adb push $NEWEST_KEY /home/phablet/.ssh/authorized_keys
-adb shell chown phablet:phablet -R /home/phablet/.ssh/
-adb shell chmod 700 /home/phablet/.ssh
-adb shell chmod 600 /home/phablet/.ssh/authorized_keys
+KEY_CONTENT="$(cat $NEWEST_KEY)"
+
+# make sure we have a ~/.ssh/ dir before trying to write to it
+adb shell "[ -d ~/.ssh ] || mkdir ~/.ssh"
+
+# append the key to authorized_keys if it is not there already
+adb shell "touch  ~/.ssh/authorized_keys"
+if [ -z "$(adb shell "grep \"$KEY_CONTENT\" ~/.ssh/authorized_keys")" ]; then
+    adb shell "echo $KEY_CONTENT >>~/.ssh/authorized_keys"
+    adb shell "chmod 700 ~/.ssh"
+    adb shell "chmod 600 ~/.ssh/authorized_keys"
+fi
 
 # Copy your bash config down to the device so you get the benefit of your
 # colourful $PS1 prompt and any bash aliases that you may be used to from your
@@ -115,4 +126,4 @@
 ssh $SSH_OPTS phablet@localhost
 
 # turn off ssh access again
-toggle_ssh false
+[ -n "$SSH_RUNNING" ] || toggle_ssh false