Fix code extracting the xorriso version

The code was assuming that the first line of output was something like
this (and this is the case of the cd builder machine that uses a custom
built xorriso):
> GNU xorriso 1.2.6 : RockRidge filesystem manipulator, libburnia project.

But the output of the version packaged in Debian does not have the GNU
string:
> xorriso 1.3.2 : RockRidge filesystem manipulator, libburnia project.

We fix this issue by extracting the version from the line starting with
"xorriso version" which does not have this discrepancy.
This commit is contained in:
Raphaël Hertzog 2014-03-27 15:55:36 +01:00
parent 78b84f92a9
commit 0cfa70e113
5 changed files with 11 additions and 8 deletions

3
debian/changelog vendored
View File

@ -7,6 +7,9 @@ debian-cd (3.1.15) UNRELEASED; urgency=low
[ Samuel Thibault ] [ Samuel Thibault ]
* Make kfreebsd & hurd images usbkey-bootable. Closes: #739422 * Make kfreebsd & hurd images usbkey-bootable. Closes: #739422
[ Raphaël Hertzog ]
* Fix code extracting the xorriso version.
-- Steve McIntyre <93sam@debian.org> Tue, 11 Feb 2014 01:57:01 +0000 -- Steve McIntyre <93sam@debian.org> Tue, 11 Feb 2014 01:57:01 +0000
debian-cd (3.1.14) unstable; urgency=medium debian-cd (3.1.14) unstable; urgency=medium

View File

@ -23,8 +23,8 @@ fi
case "$MKISOFS" in case "$MKISOFS" in
*xorriso*) *xorriso*)
XORRISO_VER=$($MKISOFS --version 2>&1 | awk ' XORRISO_VER=$($MKISOFS --version 2>&1 | awk '
NR==1 { /^xorriso version/ {
split($3, ver, ".") split($4, ver, ".")
print ver[1]*10000+ver[2]*100+ver[3] print ver[1]*10000+ver[2]*100+ver[3]
}') }')
# OK # OK

View File

@ -30,8 +30,8 @@ fi
case "$MKISOFS" in case "$MKISOFS" in
*xorriso*) *xorriso*)
XORRISO_VER=$($MKISOFS --version 2>&1 | awk ' XORRISO_VER=$($MKISOFS --version 2>&1 | awk '
NR==1 { /^xorriso version/ {
split($3, ver, ".") split($4, ver, ".")
print ver[1]*10000+ver[2]*100+ver[3] print ver[1]*10000+ver[2]*100+ver[3]
}') }')
# OK # OK

View File

@ -30,8 +30,8 @@ fi
case "$MKISOFS" in case "$MKISOFS" in
*xorriso*) *xorriso*)
XORRISO_VER=$($MKISOFS --version 2>&1 | awk ' XORRISO_VER=$($MKISOFS --version 2>&1 | awk '
NR==1 { /^xorriso version/ {
split($3, ver, ".") split($4, ver, ".")
print ver[1]*10000+ver[2]*100+ver[3] print ver[1]*10000+ver[2]*100+ver[3]
}') }')
# OK # OK

View File

@ -38,8 +38,8 @@ fi
case "$MKISOFS" in case "$MKISOFS" in
*xorriso*) *xorriso*)
XORRISO_VER=$($MKISOFS --version 2>&1 | awk ' XORRISO_VER=$($MKISOFS --version 2>&1 | awk '
NR==1 { /^xorriso version/ {
split($3, ver, ".") split($4, ver, ".")
print ver[1]*10000+ver[2]*100+ver[3] print ver[1]*10000+ver[2]*100+ver[3]
}') }')
# OK # OK