From 340446b3fdccd9df444243889781ffc470da766d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 19 Aug 2022 16:00:57 -0600 Subject: [PATCH] remove checks/tests for JACK and QJackctl during installation We discourage the use of JACK by first time users these days, and it's really not our job to make sure it is installed correctly --- tools/linux_packaging/stage2.run.in | 139 ---------------------------- 1 file changed, 139 deletions(-) diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in index 9c176a78f3..06f28ae9c5 100755 --- a/tools/linux_packaging/stage2.run.in +++ b/tools/linux_packaging/stage2.run.in @@ -715,145 +715,6 @@ if test "${PGM_VENDOR}" = "Ardour" -a -d "${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/ fi fi -########################### -# Check Jack and qjackctl -########################### - -echo "" -echo "Checking to see if Jack is installed" -echo "" - -JACK_INSTALLED="f" - -if which jackd > /dev/null; then - JACK_INSTALLED="t" - echo "Jack already present" -elif which jackdbus > /dev/null; then - echo "" - echo "jackdbus was found but not jackd. Jack version compatibility check cannot be performed." - echo "" - JACK_INSTALLED="i" -else - echo "" - echo "The program Jack is missing from this system." - echo "" - echo "Jack is a very useful utility to allow you to interconnect $PGM_NAME and other audio/MIDI applications." - echo "You can use $PGM_NAME without it, but you may find it useful to have around." - echo "" - - ANSWER=$(VaildateYesNoQuestion "Install jack using system software repository?") - - if test "y" = $ANSWER; - then - echo "Attempting to install Jack" - SystemInstall "jackd" - - if [ $? -ne 0 ]; - then - echo "" - read -p "Press ENTER to continue:" BLAH - else - JACK_INSTALLED="t" - fi - fi -fi - -# Check to see if Jack is new enough to operate correctly. - -if [ "t" = ${JACK_INSTALLED} ]; -then - JACK_VERSION_OK="f" - JACK_VER_STRING=$(jackd --version | grep -e "jackd.*protocol") - JACK_NAME=$(echo $JACK_VER_STRING | awk '{print $1}') - JACK_VERSION=$(echo $JACK_VER_STRING | awk '{print $3}' | sed 's/-.*$//') - JACK_VERSION_MAJOR=$(echo $JACK_VERSION | awk 'BEGIN{FS="."}{print $1}') - JACK_VERSION_MIDDLE=$(echo $JACK_VERSION | awk 'BEGIN{FS="."}{print $2}') - JACK_VERSION_MINOR=$(echo $JACK_VERSION | awk 'BEGIN{FS="."}{print $3}') - - if [ "jackd" = ${JACK_NAME} ]; - then - 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 [ ${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 - fi - - if [ "t" = ${JACK_VERSION_OK} ]; - then - echo "" - echo "Jack Version Check OK (${JACK_VER_STRING})" - echo "" - else - echo "" - echo "!!! WARNING !!! - The version of Jack on this system is too old!" - echo "Using an old version of Jack is not recommended. Please update" - echo "Jack for best results." - echo "" - echo "System Jack version:" - echo " ${JACK_VER_STRING}" - echo "" - echo "Recommended minimum versions:" - echo " Jack1 - 0.121.3" - echo " Jack2 - 1.9.8" - echo "" - read -p "Press ENTER to continue:" BLAH - fi -fi - -if ! which qjackctl > /dev/null; -then - echo "" - echo "The program QjackCtl is missing from this system." - echo "QjackCtl is an extremely useful tool for any system that runs JACK applications like $PGM_NAME." - echo "We recommend that you install it." - echo "" - - ANSWER=$(VaildateYesNoQuestion "Install QjackCtl using system software repository?") - - if test "y" = $ANSWER; - then - echo "Attempting to install QjackCtl" - SystemInstall "qjackctl" - - if [ $? -ne 0 ]; - then - echo "" - read -p "Press ENTER to continue:" BLAH - fi - fi -fi - - ######################## # Run Sanity Check ########################