summaryrefslogtreecommitdiff
path: root/tools/linux_packaging
diff options
context:
space:
mode:
authorTodd Naugle <toddn@glw.com>2013-02-21 21:47:12 +0000
committerTodd Naugle <toddn@glw.com>2013-02-21 21:47:12 +0000
commit9c4a4e837458dfe4ea8146fd9bcce508c74dd834 (patch)
tree2c0db282d3c42b3b7272949284c1905df3216dac /tools/linux_packaging
parent0efedf3b853f79614694fe2bd8230a5859f6fed9 (diff)
fix logic error in jack version check that caused it to not detect newer jack versions
git-svn-id: svn://localhost/ardour2/branches/3.0@14082 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools/linux_packaging')
-rwxr-xr-xtools/linux_packaging/stage2.run28
1 files changed, 26 insertions, 2 deletions
diff --git a/tools/linux_packaging/stage2.run b/tools/linux_packaging/stage2.run
index c8a73d87f9..3ab8b70368 100755
--- a/tools/linux_packaging/stage2.run
+++ b/tools/linux_packaging/stage2.run
@@ -551,13 +551,37 @@ then
if [ "jackd" = ${JACK_NAME} ];
then
- if [ 0 -le ${JACK_VERSION_MAJOR} -a 121 -le ${JACK_VERSION_MIDDLE} -a 3 -le ${JACK_VERSION_MINOR} ];
+ if [ ${JACK_VERSION_MAJOR} -eq 0 ];
+ then
+ if [ ${JACK_VERSION_MIDDLE} -eq 121 ];
+ then
+ if [ ${JACK_VERSION_MINOR} -ge 3 ];
+ then
+ JACK_VERSION_OK="t"
+ fi
+ elif [ ${JACK_VERSION_MIDDLE} -gt 121 ];
+ then
+ JACK_VERSION_OK="t"
+ fi
+ elif [ ${JACK_VERSION_MAJOR} -gt 0 ];
then
JACK_VERSION_OK="t"
fi
elif [ "jackdmp" = ${JACK_NAME} ];
then
- if [ 1 -le ${JACK_VERSION_MAJOR} -a 9 -le ${JACK_VERSION_MIDDLE} -a 8 -le ${JACK_VERSION_MINOR} ];
+ if [ ${JACK_VERSION_MAJOR} -eq 1 ];
+ then
+ if [ ${JACK_VERSION_MIDDLE} -eq 9 ];
+ then
+ if [ ${JACK_VERSION_MINOR} -ge 8 ];
+ then
+ JACK_VERSION_OK="t"
+ fi
+ elif [ ${JACK_VERSION_MIDDLE} -gt 9 ];
+ then
+ JACK_VERSION_OK="t"
+ fi
+ elif [ ${JACK_VERSION_MAJOR} -gt 1 ];
then
JACK_VERSION_OK="t"
fi