Merge lp:~achiang/telegram-app/karni-fix-1 into lp:telegram-app/app

Proposed by Alex Chiang
Status: Merged
Merged at revision: 31
Proposed branch: lp:~achiang/telegram-app/karni-fix-1
Merge into: lp:telegram-app/app
Diff against target: 32 lines (+9/-5)
2 files modified
README.md (+1/-5)
click.sh (+8/-0)
To merge this branch: bzr merge lp:~achiang/telegram-app/karni-fix-1
Reviewer Review Type Date Requested Status
Michał Karnicki (community) Approve
Review via email: mp+230893@code.launchpad.net

Description of the change

Cherry-pick another of karni's code to make ``click.sh install`` work.

To post a comment you must log in.
Revision history for this message
Michał Karnicki (karni) wrote :

I'm glad! I actually use that multiple times a day :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2014-08-06 11:47:02 +0000
3+++ README.md 2014-08-14 21:18:22 +0000
4@@ -44,11 +44,7 @@
5 This step will create an armhf click package suitable for installation on
6 an Ubuntu Phone/Tablet device. To install the package for testing:
7
8- adb push com.canonical.telegram* /tmp
9- adb shell
10- sudo -iu phablet
11- cd /tmp
12- pkcon install-local com.canonical.telegram*
13+ ./click.sh install
14
15 Afterwards, search for the "telegram" in the App scope, and tap the icon
16 to launch the app.
17
18=== modified file 'click.sh'
19--- click.sh 2014-08-01 08:41:35 +0000
20+++ click.sh 2014-08-14 21:18:22 +0000
21@@ -35,3 +35,11 @@
22 echo "Done click packaging."
23 echo "ARCHITECTURE: ${CLICK_SDK_ARCH}"
24 echo "---------------------"
25+
26+if [ "$1" == "install" ]; then
27+ PACKAGE=com.canonical.telegram
28+ CLICK=$(ls *.click|tail -n 1)
29+ adb shell click unregister --user=phablet $PACKAGE
30+ adb push $CLICK /tmp/
31+ adb shell sudo -u phablet -i pkcon install-local /tmp/$CLICK
32+fi

Subscribers

People subscribed via source and target branches

to all changes: