diff --git a/fragments/functions.sh b/fragments/functions.sh index ac6ab82..48246fa 100644 --- a/fragments/functions.sh +++ b/fragments/functions.sh @@ -428,8 +428,11 @@ mountDMG() { installFromDMG() { mountDMG - + if [[ -z $CLIInstaller ]]; then installAppWithPath "$dmgmount/$appName" + else + installAppWithPath "$dmgmount/$CLIInstaller" + fi } installFromPKG() { diff --git a/fragments/labels/adobecreativeclouddesktop.sh b/fragments/labels/adobecreativeclouddesktop.sh index 30b11e2..ee94acc 100644 --- a/fragments/labels/adobecreativeclouddesktop.sh +++ b/fragments/labels/adobecreativeclouddesktop.sh @@ -1,6 +1,6 @@ adobecreativeclouddesktop) - name="Creative Cloud" - appName="Install.app" + name="Adobe Creative Cloud" + #appName="Install.app" type="dmg" if [[ $(arch) == "arm64" ]]; then downloadURL=$(curl -fs "https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" | grep -o "https*.*macarm64.*dmg" | cut -d '"' -f1 | head -1) diff --git a/fragments/labels/parallelsdesktop.sh b/fragments/labels/parallelsdesktop.sh new file mode 100644 index 0000000..30aec8c --- /dev/null +++ b/fragments/labels/parallelsdesktop.sh @@ -0,0 +1,13 @@ +parallelsdesktop) + name="Parallels Desktop" + #appName="Install.app" + type="dmg" + downloadURL=$(curl -fs https://update.parallels.com/desktop/v17/parallels/parallels_updates.xml | xpath '(//ParallelsUpdates/Product/Version/Update/FilePath)[1]' 2>/dev/null | grep -oi "https*.*\.dmg") + appNewVersion=$(curl -fs https://update.parallels.com/desktop/v17/parallels/parallels_updates.xml | xpath '(//ParallelsUpdates/Product/Version/Update/FilePath)[1]' 2>/dev/null | grep -oi "https*.*\.dmg" | cut -d "/" -f6 | cut -d "-" -f1) + expectedTeamID="4C6364ACXT" + CLIInstaller="Install.app/Contents/MacOS/Install" + CLIArguments=(install -t "/Applications/Parallels Desktop.app") + #Company="Parallels" + #PatchSkip="YES" + ;; + diff --git a/fragments/labels/parallelsdesktop16.sh b/fragments/labels/parallelsdesktop16.sh new file mode 100644 index 0000000..eee76b0 --- /dev/null +++ b/fragments/labels/parallelsdesktop16.sh @@ -0,0 +1,17 @@ +parallelsdesktop16) + name="Parallels Desktop" + #appName="Install.app" + type="dmg" + if [[ $(arch) == i386 ]]; then + downloadURL="https://www.parallels.com/directdownload/pd16/intel/?experience=enter_key" + elif [[ $(arch) == arm64 ]]; then + downloadURL="https://www.parallels.com/directdownload/pd16/m1/?experience=enter_key" + fi + appNewVersion=$( curl -fsIL "$downloadURL" | grep -i "^location" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-[0-9]*\..*/\1/g' ) + expectedTeamID="4C6364ACXT" + CLIInstaller="Install.app/Contents/MacOS/Install" + CLIArguments=(install -t "/Applications/Parallels Desktop.app") + #Company="Parallels" + #PatchSkip="YES" + ;; +