Use suffix for macOS packages

.travis.yml

@@ -75,8 +75,6 @@ install:
   - bash ${TRAVIS_BUILD_DIR}/.travis/install.sh
 
 script:
-  - rm -rf ${HOME}/PawPawBuilds/builds/macos-universal/distrho-ports-arctican-575d56057ba9cee8505839e4ee00cc26d0193fc9
-  - rm -rf ${HOME}/PawPawBuilds/builds/win32/distrho-ports-vitalium-c81c63cb42b866ab47b1c3749ef7251e0e5b0818
   - bash ${TRAVIS_BUILD_DIR}/bootstrap-plugins.sh ${TARGET}
   - bash ${TRAVIS_BUILD_DIR}/.cleanup.sh ${TARGET}
   - bash ${TRAVIS_BUILD_DIR}/.travis/script.sh
@@ -89,7 +87,6 @@ deploy:
   file:
     - setup/inno/PawPaw-*.exe
     - setup/macos/PawPaw-*.pkg
-    #- setup/macos-universal/PawPaw-*.pkg
   on:
     tags: true
 

pack-plugins.sh

@@ -115,6 +115,11 @@ if [ "${WIN32}" -eq 1 ]; then
     create_innosetup_exe
 
 elif [ "${MACOS}" -eq 1 ] && [ "${MACOS_OLD}" -eq 0 ]; then
+    if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
+        suffix="universal"
+    else
+        suffix="intel"
+    fi
     pushd setup/macos
     python -c "
 with open('package.xml.in', 'r') as fh:
@@ -129,7 +134,7 @@ print(packagexml.replace('@CURDIR@','${PWD}').replace('@CHOICES@',choicesxml).re
         --identifier studio.kx.distrho.pawpaw \
         --package-path "${PWD}" \
         --version ${VERSION} \
-        PawPaw-macOS-v${VERSION}.pkg
+        PawPaw-macOS-${suffix}-v${VERSION}.pkg
     rm package.xml pawpaw-bundle-*
     popd
 fi