diff --git a/build-jack2.sh b/build-jack2.sh index 29f4d70..f595199 100755 --- a/build-jack2.sh +++ b/build-jack2.sh @@ -147,12 +147,7 @@ if [ -f "${PAWPAW_PREFIX}/bin/moc" ]; then build_autoconf qjackctl "${QJACKCTL_VERSION}" "--enable-jack-version ${qjackctl_extra_args}" - if [ "${MACOS}" -eq 1 ]; then - cp "${PAWPAW_ROOT}/patches/qjackctl/QjackCtl.icns" "${PAWPAW_BUILDDIR}/qjackctl${name}-${QJACKCTL_VERSION}/src/qjackctl.app/Contents/Resources/QjackCtl.icns" - patch_file qjackctl "${QJACKCTL_VERSION}" "src/qjackctl.app/Contents/Info.plist" 's|Created by Qt/QMake|JACK Audio Connection Kit Qt GUI Interface|' - patch_file qjackctl "${QJACKCTL_VERSION}" "src/qjackctl.app/Contents/Info.plist" 's|com.yourcompany.qjackctl|org.rncbc.QjackCtl|' - patch_file qjackctl "${QJACKCTL_VERSION}" "src/qjackctl.app/Contents/Info.plist" 's||QjackCtl.icns|' - elif [ "${WIN32}" -eq 1 ]; then + if [ "${WIN32}" -eq 1 ]; then copy_file qjackctl "${QJACKCTL_VERSION}" "src/release/qjackctl.exe" "${jack2_prefix}/bin/qjackctl.exe" fi fi diff --git a/pack-jack2.sh b/pack-jack2.sh index 568aa61..f856d0b 100755 --- a/pack-jack2.sh +++ b/pack-jack2.sh @@ -105,11 +105,19 @@ elif [ "${MACOS}" -eq 1 ]; then patch_osx_qtapp qjackctl "${QJACKCTL_VERSION}" "${qjackctl_app}" patch_osx_binary_libs "${qjackctl_dir}/qjackctl" + cp "${PAWPAW_ROOT}/patches/qjackctl/QjackCtl.icns" "${qjackctl_app}/Contents/Resources/QjackCtl.icns" + sed -i -e 's|Created by Qt/QMake|JACK Audio Connection Kit Qt GUI Interface|' "${qjackctl_app}/Contents/Info.plist" + sed -i -e 's|com.yourcompany.qjackctl|org.rncbc.QjackCtl|' "${qjackctl_app}/Contents/Info.plist" + sed -i -e 's|string>qjackctl|string>QjackCtl|' "${qjackctl_app}/Contents/Info.plist" + sed -i -e 's||QjackCtl.icns|' "${qjackctl_app}/Contents/Info.plist" + rm "${qjackctl_app}/Contents/Info.plist-e" + mv "${qjackctl_app}/Contents/MacOS/qjackctl" "${qjackctl_app}/Contents/MacOS/QjackCtl" + rm -rf jack2/macosx/qjackctl.app - cp -rv "${PAWPAW_PREFIX}/bin/qjackctl.app" jack2/macosx/ + cp -rv "${qjackctl_app}" jack2/macosx/QjackCtl.app rm -f jack2-macOS-${JACK2_VERSION}.tar.gz - tar czf jack2-macOS-${JACK2_VERSION}.tar.gz -C jack2/macosx jack2-osx-${jack2_lastversion}.pkg qjackctl.app + tar czf jack2-macOS-${JACK2_VERSION}.tar.gz -C jack2/macosx jack2-osx-${jack2_lastversion}.pkg QjackCtl.app fi # ---------------------------------------------------------------------------------------------------------------------