update osx DMG icon tool paths

[ardour.git] / tools / linux_packaging / stage2.run

diff --git a/tools/linux_packaging/stage2.run b/tools/linux_packaging/stage2.run
index f74e988650594c47de5b0e3e987aae3f722c1884..e98810e8208f783dceed6ecf76d9fd4356c86d52 100755 (executable)
--- a/tools/linux_packaging/stage2.run
+++ b/tools/linux_packaging/stage2.run
@@ -371,18 +371,17 @@ fi
 ################################
 # Setup derived variables
 ################################
-PGM_VERSION=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $2 }' | awk 'BEGIN { FS = "_"} ; { print $1}')
-PGM_BUILD=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $2 }' | awk 'BEGIN { FS = "_"} ; { print $2}')
-PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $3 }')
+PGM_VERSION=$(echo ${BUNDLE_DIR} | cut -d- -f2)
+PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | cut -d- -f3)
 
 if [ -z ${PGM_BUILDTYPE} ];
 then
-       PGM_FULL_NAME="${PGM_NAME}-${PGM_VERSION}_${PGM_BUILD}"
+       PGM_FULL_NAME="${PGM_NAME}-${PGM_VERSION}"
        ICON_NAME="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}"                    #no dash between name and version since dash seperates vendor from program
        MENU_FILE="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}.desktop"    #no dash between name and version since dash seperates vendor from program
        DESKTOP_LINK_FILE="${PGM_NAME}_${PGM_VERSION}.desktop"
 else
-       PGM_FULL_NAME="${PGM_NAME}-${PGM_VERSION}_${PGM_BUILD}-${PGM_BUILDTYPE}"
+       PGM_FULL_NAME="${PGM_NAME}-${PGM_VERSION}-${PGM_BUILDTYPE}"
        ICON_NAME="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}_${PGM_BUILDTYPE}"                   #no dash between name and version since dash seperates vendor from program
        MENU_FILE="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}_${PGM_BUILDTYPE}.desktop"   #no dash between name and version since dash seperates vendor from program
        DESKTOP_LINK_FILE="${PGM_NAME}_${PGM_VERSION}_${PGM_BUILDTYPE}.desktop"
@@ -421,7 +420,7 @@ fi
 # install 
 
 echo ""
-echo "Installing ${PGM_NAME} ${PGM_VERSION} built from ${PGM_BUILD} in ${INSTALL_DEST_BASE}"
+echo "Installing ${PGM_NAME} ${PGM_VERSION} in ${INSTALL_DEST_BASE}"
 echo ""
 
 # Copy the new version in the install directory
@@ -456,6 +455,7 @@ then
        ${SUPER} xdg-icon-resource install --context apps --size 22 ${ICON_PATH}/${PGM_NAME_LOWER}_icon_22px.png ${ICON_NAME}
        ${SUPER} xdg-icon-resource install --context apps --size 32 ${ICON_PATH}/${PGM_NAME_LOWER}_icon_32px.png ${ICON_NAME}
        ${SUPER} xdg-icon-resource install --context apps --size 48 ${ICON_PATH}/${PGM_NAME_LOWER}_icon_48px.png ${ICON_NAME}
+       ${SUPER} xdg-icon-resource install --context apps --size 256 ${ICON_PATH}/${PGM_NAME_LOWER}_icon_256px.png ${ICON_NAME}
 
        if [ -e ${ICON_PATH}/${PGM_NAME_LOWER}_icon.svg -a -d /usr/share/icons/hicolor/scalable/apps ]; 
        then
@@ -509,6 +509,8 @@ echo ""
 echo "Checking to see if Jack is installed"
 echo ""
 
+JACK_INSTALLED="f"
+
 if ! which jackd > /dev/null;
 then
        echo ""
@@ -521,17 +523,91 @@ then
        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
 else
-       echo "Jack OK"
+       JACK_INSTALLED="t"
+       echo "Jack already present"
 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}')
+       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