Merge pull request #30 from corbindavenport/dev

Update script to support 2018 apps

README.md

@@ -1,12 +1,12 @@
 # Creative Cloud for PlayOnLinux
 
-This is an install script for [Adobe Creative Cloud](https://www.adobe.com/creativecloud.html), designed to be used with [PlayOnLinux](https://www.playonlinux.com). This downloads and installs the Creative Cloud software from Adobe's website. Once setup is completed, you can use the Adobe Application Manager to download and install Photoshop, Dreamweaver, Illustrator, and other apps.
+This is an install script for [Adobe Creative Cloud](https://www.adobe.com/creativecloud.html), designed to be used with [PlayOnLinux](https://www.playonlinux.com). The script sets up the Adobe Creative Cloud desktop program, which can be used to install and update Photoshop, Lightroom, Dreamweaver, Illustrator, and other apps.
 
-**NOTE:** Only Application Manager, Photoshop CC 2015, and Lightroom 5 have been extensively tested. This method does not allow the installation of CC 2017 applications, only the earlier 2015 versions. Support for newer Adobe applications is currently [in development](https://github.com/corbindavenport/creative-cloud-linux/tree/dev).
+**NOTE:** Only Photoshop CC, Bridge CC, Lightroom 5, and the Creative Cloud manager have been extensively tested. The newest Lightroom CC app is not supported right now. File syncing currently [does not work](https://github.com/corbindavenport/creative-cloud-linux/issues/29).
 
-![Adobe Application Manager](https://i.imgur.com/MSIIpdt.png)
+![Photoshop CC Screenshot](https://i.imgur.com/0JUQYuR.png)
 
-A (free) Adobe ID is required to install additional applications. Most Adobe applications require [a paid subscription](https://www.adobe.com/creativecloud/plans.html).
+A (free) Adobe ID is required. Most Adobe applications require [a paid subscription](https://www.adobe.com/creativecloud/plans.html).
 
 ## How to use this script
 
@@ -15,21 +15,11 @@ A (free) Adobe ID is required to install additional applications. Most Adobe app
 3. Open PlayOnLinux, go to Tools > Run a local script
 4. Select the install script you just downloaded
 
-After the setup process is finished, you can open Adobe Application Manager from PlayOnLinux to download and install the apps you need. After you download an app, you can add a PlayOnLinux shortcut for it by clicking Adobe Application Manager in the app list, clicking `Configure`, and clicking `Make a new shortcut from this virtual drive`. Then look for the app you need, like Photoshop.exe, and add it.
+After the setup process is finished, you can open `Adobe Creative Cloud` from PlayOnLinux to download and install the apps you need. After you download an app, you can add a PlayOnLinux shortcut for it by clicking Adobe Application Manager in the app list, clicking `Configure`, and clicking `Make a new shortcut from this virtual drive`. Then look for the app you need, like Photoshop.exe, and add it.
 
-If the installer crashes, see the [Troubleshooting page](https://github.com/corbindavenport/creative-cloud-linux/wiki/Troubleshooting).
-
-## Background info
-
-I made this script because getting Creative Cloud working in Wine is pretty difficult, thanks to multiple versions of the setup program being available from Adobe's website that vary in compatibility with Wine. I found that the Creative Cloud setup program from the Photoshop download page works best in Wine, especially when the OS is temporarily set to Windows XP.
+**Tip:** Tooltips in Photoshop might not disappear automatically. You can turn off tooltips completely by going to `Edit > Preferences > Tools` and un-checking the `Show tooltips` box.
 
-Here's everything the script does, if you want to re-create this in normal Wine:
-
-* Creates a new Wine prefix and sets the OS to Windows XP
-* Installs atmlib, corefonts, FontsSmoothRGB, and gdiplus
-* Downloads and runs the the Creative Cloud setup program from the Photoshop download page ([direct link](https://ccmdls.adobe.com/AdobeProducts/PHSP/18_1_1/win32/AAMmetadataLS20/CreativeCloudSet-Up.exe))
-* After Creative Cloud/Application Manager is done installing, set the OS back to Windows 7 so newer apps can be installed
-* Creates a shortcut for PDapp.exe (Adobe Application Manager)
+If the installer crashes, see the [Troubleshooting page](https://github.com/corbindavenport/creative-cloud-linux/wiki/Troubleshooting).
 
 ---------------------------------------
 

creativecloud.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Date : (2017-10-03)
+# Date : (02-15-2018)
 # Distribution used to test : Ubuntu 17.10 x64
 # Author : Corbin Davenport
 # Licence : GPLv3
@@ -11,8 +11,8 @@
 [ "$PLAYONLINUX" = "" ] && exit 0
 source "$PLAYONLINUX/lib/sources"
 
-PREFIX="CreativeCloud"
-WINEVERSION="2.17-staging"
+PREFIX="CreativeCloud2018"
+WINEVERSION="2.20-staging"
 TITLE="Adobe Creative Cloud"
 EDITOR="Adobe Systems Inc."
 GAME_URL="http://www.adobe.com"
@@ -31,43 +31,32 @@ POL_SetupWindow_presentation "$TITLE" "$EDITOR" "$GAME_URL" "$AUTHOR" "$PREFIX"
 POL_Wine_SelectPrefix "$PREFIX"
 POL_Wine_PrefixCreate "$WINEVERSION"
 POL_System_TmpCreate "AppManagerTmp"
-Set_OS "winxp"
+Set_OS "win7"
 
 # Install dependencies
-POL_Call POL_Install_atmlib
-POL_Call POL_Install_corefonts
-POL_Call POL_Install_FontsSmoothRGB
-POL_Call POL_Install_gdiplus
+POL_SetupWindow_wait "Please wait while msxml3 is installed..." "$TITLE"
+POL_Call POL_Install_msxml3
+cd "$POL_System_TmpDir"
+# Use winetricks, since the POL_corefonts version does not work with the installer
+POL_Download_Resource  "https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks"
+POL_SetupWindow_wait "Please wait while winetricks is installed... (this might take a few minutes)" "$TITLE"
+chmod +x winetricks 
+./winetricks atmlib corefonts fontsmooth=rgb
 
 # Get the installer
-POL_SetupWindow_message "$(eval_gettext 'On the next screen, you can choose between automatically downloading the Creative Cloud installer, or selecting it from your computer.\n\nIt is HIGHLY RECOMMENDED to let the script download the Creative Cloud installer for you, since the downloaded version has been verified to work.')" "$TITLE"
-POL_SetupWindow_InstallMethod "LOCAL,DOWNLOAD"
-if [ "$INSTALL_METHOD" = "LOCAL" ]
-then
-    # The normal Creative Cloud setup requires Windows 7 or higher
-    Set_OS "win7"
-    POL_SetupWindow_browse "Please select the Creative Cloud install program." "$TITLE"
-    POL_SetupWindow_wait "Installation in progress..." "$TITLE"
-    INSTALLER="$APP_ANSWER"
-elif [ "$INSTALL_METHOD" = "DOWNLOAD" ]
-then
-    cd "$POL_System_TmpDir"
-    # The Creative Cloud setup program from the Photoshop download link on Adobe's website only needs Windows XP, and seems to work better in Wine
-    POL_Download "https://ccmdls.adobe.com/AdobeProducts/PHSP/18_1_1/win32/AAMmetadataLS20/CreativeCloudSet-Up.exe"
-    POL_SetupWindow_wait "Installation in progress..." "$TITLE"
-    INSTALLER="$POL_System_TmpDir/CreativeCloudSet-Up.exe"
-fi
+POL_SetupWindow_wait "Installation in progress..." "$TITLE"
+cd "$POL_System_TmpDir"
+POL_Download "https://ccmdls.adobe.com/AdobeProducts/KCCC/1/win32/CreativeCloudSet-Up.exe"
+INSTALLER="$POL_System_TmpDir/CreativeCloudSet-Up.exe"
 
-# Installation
-POL_SetupWindow_message "$(eval_gettext 'Once Adobe Application Application Manager is installed and you finish logging in, come back to this setup window and click Next. Some final adjustments have to be made by the script in order to run newer Adobe programs.\n\nIf the installer crashes or freezes at this step, check the Troubleshooting page: http://bit.ly/cctroubleshooting')" "$TITLE"
+# Run the installer
 POL_Wine_WaitBefore "$TITLE"
 POL_Wine "$INSTALLER"
-POL_Shortcut "PDapp.exe" "Adobe Application Manager"
-Set_OS "win7"
+POL_Shortcut "Creative Cloud.exe" "Adobe Creative Cloud"
 POL_System_TmpDelete
 
 # All done
-POL_SetupWindow_message "$(eval_gettext 'The installation is now complete, you can now use Adobe Application Manager to download and install the applications you need.\n\nYou will need to close and re-open Application Manager to see newer apps, like CC 2015.\n\nAfter you download an app, you can add a PlayOnLinux shortcut for it by clicking Adobe Application Manager in the app list, clicking CONFIGURE, and clicking MAKE A NEW SHORTCUT FROM THIS VIRTUAL DRIVE. Then look for the app, like Photoshop.exe, and add it.')" "$TITLE"
-  
+POL_SetupWindow_message "$(eval_gettext 'The installation is now complete, you can now use the Adobe Creative Cloud manager to download the applications you need.\n\nNOTE: The Creative Cloud manager takes a while to log in. That is completely normal.\n\nAfter you download an app, you can add a PlayOnLinux shortcut for it by clicking ADOBE CREATIVE CLOUD in the app list, clicking CONFIGURE, and clicking MAKE A NEW SHORTCUT FROM THIS VIRTUAL DRIVE. Then look for the app, like Photoshop.exe, and add it.')" "$TITLE"
+
 POL_SetupWindow_Close
 exit 0