Pushed dev version of script

README.md

@@ -1,33 +1,15 @@
-# Creative Cloud for PlayOnLinux
+This is the in-progress development version of the Creative Cloud Script, designed to allow newer CC apps (like Photoshop CC 2017) to run. This script can be installed alongside the one found in the master branch. **This dev version does not work right now.**
 
-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.
+Changes in this version:
 
-![Adobe Application Manager](https://i.imgur.com/MSIIpdt.png)
+* Set default OS to Windows 7
+* Added wintrust, msasn1, winhttp, wininet, and vcrun2008 packages from [POL function repository](https://www.playonlinux.com/repository/?cat=100) to fix some errors with the installer
+* Download the actual Creative Cloud installer program from Adobe, instead of an older Photoshop installer
+* Removed option to choose a local install .exe
 
-A (free) Adobe ID is required to install additional applications. Most Adobe applications require [a paid subscription](https://www.adobe.com/creativecloud/plans.html).
+The key to getting newer Adobe software working is to use the updated Creative Cloud desktop application. The stable version of this script installs the older 'Adobe Application Manager,' which only allows CC 2015 apps and older to be downloaded.
 
-**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. I'm looking into a fix. If you run into warnings about video memory size, open PlayOnLinux and go to Configure > Display > Video memory size.
-
-## How to use this script
-
-1. Download PlayOnLinux from your distribution's package manager (e.g. Ubuntu Software Center) or from [the PlayOnLinux website](https://www.playonlinux.com/en/download.html)
-2. Save the [install script](https://raw.githubusercontent.com/corbindavenport/creative-cloud-linux/master/creativecloud.sh) to your computer
-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. 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.
-
-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)
+Even with the current changes to the script, the Creative Cloud installer still fails every time, either at 3% with a Wine crash or at 5% with a download error.
 
 ---------------------------------------
 
@@ -42,4 +24,4 @@ Here's everything the script does, if you want to re-create this in normal Wine:
  GNU General Public License for more details.
 
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http:https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http:https://www.gnu.org/licenses/>.

creativecloud.sh

@@ -11,7 +11,7 @@
 [ "$PLAYONLINUX" = "" ] && exit 0
 source "$PLAYONLINUX/lib/sources"
 
-PREFIX="CreativeCloud"
+PREFIX="CreativeCloudDev"
 WINEVERSION="2.17-staging"
 TITLE="Adobe Creative Cloud"
 EDITOR="Adobe Systems Inc."
@@ -31,43 +31,56 @@ 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_Call POL_Install_wintrust
+POL_Call POL_Install_msasn1
+POL_Call POL_Install_vcrun2008
+# The 'POL_Install_winhttp' command seems to go to a dead link, this is a modifed version:
+POL_Download_Resource "https://web.archive.org/web/20061224003406/http:https://download.microsoft.com/download/5/0/c/50c42d0e-07a8-4a2b-befb-1a403bd0df96/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe" "0c0f6e300800e49472e9b2e0890a09c1" "0c0f6e300800e49472e9b2e0890a09c1"
+
+cd "$WINEPREFIX/drive_c/windows/temp"
+cabextract "$POL_USER_ROOT/ressources/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe" -F WINHTTP.DLL
+if [ "$POL_ARCH" = "amd64" ]; then
+ cp -f WINHTTP.DLL ../syswow64/winhttp.dll
+else
+ cp -f WINHTTP.DLL ../system32/winhttp.dll
+fi
+POL_Wine_OverrideDLL "native, builtin" "winhttp"
+# End custom winhttp
+# The 'POL_Install_wininet' command seems to go to a dead link, this is a modifed version:
+POL_Download_Resource "https://web.archive.org/web/20061224003406/http:https://download.microsoft.com/download/5/0/c/50c42d0e-07a8-4a2b-befb-1a403bd0df96/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe" "0c0f6e300800e49472e9b2e0890a09c1"
+cd "$WINEPREFIX/drive_c/windows/temp"
+cabextract "$POL_USER_ROOT/ressources/IE5.01sp4-KB871260-Windows2000sp4-x86-ENU.exe" -F WININET.DLL
+if [ "$POL_ARCH" = "amd64" ]; then
+ cp -f WININET.DLL ../syswow64/wininet.dll
+else
+ cp -f WININET.DLL ../system32/wininet.dll
+fi
+POL_Wine_OverrideDLL "native, builtin" "wininet"
+# End custom inet
 
 # 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
+cd "$POL_System_TmpDir"
+POL_Download "https://ccmdls.adobe.com/AdobeProducts/KCCC/1/win32/CreativeCloudSet-Up.exe"
+POL_SetupWindow_wait "Installation in progress..." "$TITLE"
+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:https://bit.ly/cctroubleshooting')" "$TITLE"
+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\nThe troubleshooting page will also open in your web browser, in case you run into problems.')" "$TITLE"
+POL_Browser "https://github.com/corbindavenport/creative-cloud-linux/wiki/Troubleshooting"
 POL_Wine_WaitBefore "$TITLE"
 POL_Wine "$INSTALLER"
-POL_Shortcut "PDapp.exe" "Adobe Application Manager"
+POL_Shortcut "PDapp.exe" "[DEV] Adobe Application Manager"
 Set_OS "win7"
 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_Close
-exit 0
+exit 0