[flashing] Support the check for product on Windows. Fixes MER#1961 #29
Conversation
Thaodan
force-pushed
the
batch_checkproduct
branch
from
4f67738
to
63c868e
Compare
Thaodan
changed the title
Thaodan
force-pushed
the
batch_checkproduct
branch
5 times, most recently
from
a698604
to
2ddc528
Compare
|
At least this does not work for me... I get following error: Also product is now in two places on windows flashing script |
Thaodan
force-pushed
the
batch_checkproduct
branch
3 times, most recently
from
b2e063f
to
8851c79
Compare
|
I updated the pr to the current changes but need to add a second string to match devices found. |
kickstart/pack/h4113/hybris
Outdated
| @@ -142,21 +142,27 @@ FILES_TO_COPY="*.urls" | |||
| if [ "@DEVICEMODEL@" = "h3113" ]; then | |||
| sed -e "s/\@DEVICES\@/\-e \"H3113\" -e \"H3123\" -e \"H3133\"/g" -i flash.sh | |||
| sed -e "s/\@DEVICES\@/:: H3113\r\n:: H3123\r\n:: H3133/g" -i flash-on-windows.bat | |||
| sed -e "s/\@DEVICES_FINDSTR\@/H3123 H3133/g" -i flash-on-windows.bat | |||
There was a problem hiding this comment.
Is there any reason to add a second sed command for windows script? You could just fix the existing one as that is not really used for anything just to add a comment to the script.
There was a problem hiding this comment.
Thanks for the suggestion. I've changed the layout of the which contained @Devices@ to do this.
sparse/boot/flash-on-windows.bat
Outdated
| @@ -58,33 +58,40 @@ exit /b 1 | |||
|
|
|||
| :no_error_serialnumbers | |||
|
|
|||
| for %%d in ( %serialnumbers% ) do ( | |||
| set fastbootcmd=%fastbootcmd_no_devic% -s %%d | |||
There was a problem hiding this comment.
Typo, should have fastbootcmd_no_device
|
Wondering if we need to support having multiple devices connected? That just makes the script somewhat more complicated and it's quite rare use case to have multiple devices of different type in fastboot mode connected to the computer. If we would only support one connected device then the changes in this PR would be much more simple, only a small loop to check for matching device after checking that there is only one device. |
Modifers @Devices@ to support matching on supported devices and changes the layout of the comment containing all supported devices as in flash.sh
Thaodan
force-pushed
the
batch_checkproduct
branch
from
8851c79
to
a4a49c9
Compare
|
At least for now, our requirement has been to also support Windows 7 and Windows 8. Windows 7 does not have PowerShell (not sure about Win 8). Furthermore, there has been some cases where a Windows PC has contained some PowerShell environment variables (defined on that PC) which have caused conflicts with the batch script. So we shouldn't rush into PowerShell before considering the consequences. |
|
We had to modify your code a bit and we did new pull request. Fix is here #114 |
Modifers @Devices@ to support matching on supported devices and
changes the layout of the comment containing all supported devices as in flash.sh