Merge lp:~sergiusens/ubuntu-qtcreator-plugins/phablet-flash-new-syntax into lp:ubuntu-qtcreator-plugins

[Sergio Schvezov]

Contemplating phablet-flash's new syntax

This is to take into account:
https://code.launchpad.net/~sergiusens/phablet-tools/flash_change/+merge/177927

I've added a check into the functions to verify the tool syntax to use.
I did not update the help though since the aforementioned MR should be merged Fri.

Unmerged revisions

269. By Sergio Schvezov on 2013-08-09

phablet-flash new syntax.

=== modified file 'ubuntu-qtcreator-plugins-common/share/qtcreator/ubuntu/scripts/device_flashdaily'
--- ubuntu-qtcreator-plugins-common/share/qtcreator/ubuntu/scripts/device_flashdaily	2013-06-25 16:28:00 +0000
+++ ubuntu-qtcreator-plugins-common/share/qtcreator/ubuntu/scripts/device_flashdaily	2013-08-09 04:04:13 +0000
@@ -30,8 +30,11 @@
 	echo ${DEVICE_HARDWARE}
  	echo
  	echo "          In order to flash your device, you must do it manually:"
- 	echo "             phablet-flash -s ${SERIALNUMBER} -d ${IMAGE_HARDWARE}"
+ 	echo "             phablet-flash cdimage-touch -s ${SERIALNUMBER} -d ${IMAGE_HARDWARE}"
  	echo
+elif [[ phablet_tools_new_syntax ]]; then
+	x-terminal-emulator -e "bash -ic 'phablet-flash cdimage-touch -s ${SERIALNUMBER}'"
 else
 	x-terminal-emulator -e "bash -ic 'phablet-flash -s ${SERIALNUMBER}'"
-fi
 \ No newline at end of file
+else
+fi
 
=== modified file 'ubuntu-qtcreator-plugins-common/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap'
--- ubuntu-qtcreator-plugins-common/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap	2013-06-25 16:28:00 +0000
+++ ubuntu-qtcreator-plugins-common/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap	2013-08-09 04:04:13 +0000
@@ -30,8 +30,10 @@
 	echo ${DEVICE_HARDWARE}
  	echo
  	echo "          In order to flash your device, you must do it manually:"
- 	echo "             phablet-flash -s ${SERIALNUMBER} -d ${IMAGE_HARDWARE} -b"
+ 	echo "             phablet-flash cdimage-touch -s ${SERIALNUMBER} -d ${IMAGE_HARDWARE} -b"
  	echo
+elif [[ phablet_tools_new_syntax ]]; then
+	x-terminal-emulator -e "bash -ic 'phablet-flash cdimage-touch -s ${SERIALNUMBER}' -b"
 else
 	x-terminal-emulator -e "bash -ic 'phablet-flash -s ${SERIALNUMBER}' -b"
-fi
 \ No newline at end of file
+fi
 
=== modified file 'ubuntu-qtcreator-plugins-common/share/qtcreator/ubuntu/scripts/functions.inc'
--- ubuntu-qtcreator-plugins-common/share/qtcreator/ubuntu/scripts/functions.inc	2013-07-25 09:24:30 +0000
+++ ubuntu-qtcreator-plugins-common/share/qtcreator/ubuntu/scripts/functions.inc	2013-08-09 04:04:13 +0000
@@ -64,6 +64,12 @@
 	adb_shell "su ${USERNAME} -c \"$@\""
 }
 
+function phablet_tools_new_syntax {
+    installed_version=$(dpkg-query --show --showformat '${Version}' phablet-tools)
+    dpkg --compare-versions $installed_version ge 1.0
+    echo $?
+}
+
 function ubuntu_stamp {
 	adb_shell cat /system/*ubuntu_stamp
 }