Merge lp:~saviq/phablet-tools/shell-no-mangle-keys into lp:phablet-tools

[Michał Sawicz]

[shell] Only mangle the authorized_keys file if it doesn't exist already

When someone manages their authorized_keys manually, phablet-shell didn't help with overwriting them all the time.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

Unmerged revisions

295. By Michał Sawicz on 2014-08-30

[shell] Only mangle the authorized_keys file if it doesn't exist already

=== modified file 'phablet-shell'
--- phablet-shell	2014-05-28 11:59:44 +0000
+++ phablet-shell	2014-08-30 11:08:33 +0000
@@ -76,12 +76,15 @@
 # (it changes every time the device is reflashed and this is expected)
 ssh-keygen -f ~/.ssh/known_hosts -R [localhost]:$PORT
 
-# 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
+# Only mangle the authorized_keys file if it doesn't exist already
+if ! adb pull /home/phablet/.ssh/authorized_keys /dev/null; then
+    # 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
+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