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 237f0ac93c6890492e903d14640c0175dc195190..e98810e8208f783dceed6ecf76d9fd4356c86d52 100755 (executable)
--- a/tools/linux_packaging/stage2.run
+++ b/tools/linux_packaging/stage2.run
@@ -372,18 +372,16 @@ fi
 # Setup derived variables
 ################################
 PGM_VERSION=$(echo ${BUNDLE_DIR} | cut -d- -f2)
-PGM_BUILD=$(echo ${BUNDLE_DIR} | cut -d- -f3)
-PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | cut -d- -f4)
-
+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"
@@ -393,8 +391,6 @@ PGM_EXEC_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/bin/${PGM_EXEC_FILE}"
 ICON_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share/icons"
 MENU_FILE_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share"
 
-echo "VERSION [$PGM_VERSION] BUILD [$BUILD] FULLNAME[$PGM_FULL_NAME] EXECPATH [$PGM_EXEC_PATH]"
-
 ################################
 # Install bundle and Menu/Link
 ################################
@@ -424,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
@@ -599,13 +595,13 @@ then
        else
                echo ""
                echo "!!! WARNING !!! - The version of Jack on this system is too old!"
-               echo "Using an old version of Jack is not recommened. Please update"
+               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 "Recommened minimum versions:"
+               echo "Recommended minimum versions:"
                echo "   Jack1 - 0.121.3"
                echo "   Jack2 - 1.9.8"
                echo ""