From 88baefb6210b04f6cd3e8ba12fbce84880a1e6f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=E1=BA=BF=20Trung?= Date: Sat, 14 Dec 2024 21:25:55 +0700 Subject: [PATCH 1/4] Update launcher.sh : wine64 -> wine according to current wine x64 version on Ubuntu 24.04 on 14th, Dec, 2024. --- scripts/launcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/launcher.sh b/scripts/launcher.sh index 3c79f81..1b4eb24 100755 --- a/scripts/launcher.sh +++ b/scripts/launcher.sh @@ -15,4 +15,4 @@ WINE_PREFIX="$SCR_PATH/prefix" export WINEPREFIX="$WINE_PREFIX" -wine64 "$SCR_PATH/prefix/drive_c/users/$USER/PhotoshopSE/Photoshop.exe" +wine "$SCR_PATH/prefix/drive_c/users/$USER/PhotoshopSE/Photoshop.exe" From 23d0e76f17e71da32a018d3a184ee5f72375f67a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=E1=BA=BF=20Trung?= Date: Sat, 14 Dec 2024 21:30:08 +0700 Subject: [PATCH 2/4] Update PhotoshopSetup.sh to use local installer files instead host. As there is no longer working host. --- scripts/PhotoshopSetup.sh | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/scripts/PhotoshopSetup.sh b/scripts/PhotoshopSetup.sh index ebdf453..16c08de 100755 --- a/scripts/PhotoshopSetup.sh +++ b/scripts/PhotoshopSetup.sh @@ -47,7 +47,7 @@ function main() { rmdir_if_exist $RESOURCES_PATH # winetricks atmlib corefonts fontsmooth=rgb gdiplus vcrun2008 vcrun2010 vcrun2012 vcrun2013 vcrun2015 atmlib msxml3 msxml6 gdiplus - winetricks atmlib fontsmooth=rgb vcrun2008 vcrun2010 vcrun2012 vcrun2013 atmlib msxml3 msxml6 + winetricks -q atmlib fontsmooth=rgb vcrun2008 vcrun2010 vcrun2012 vcrun2013 atmlib msxml3 msxml6 #install photoshop sleep 3 @@ -70,16 +70,11 @@ function main() { } function replacement() { - local filename="replacement.tgz" - local filemd5="6441a8e77c082897a99c2b7b588c9ac4" - local filelink="https://victor.poshtiban.io/p/gictor/photoshopCC/replacement.tgz" - local filepath="$CACHE_PATH/$filename" - - download_component $filepath $filemd5 $filelink $filename + local filelink="/home/$USER/Downloads/photoshopCC/replacement.tgz" mkdir "$RESOURCES_PATH/replacement" - show_message "extract replacement component..." - tar -xzf $filepath -C "$RESOURCES_PATH/replacement" + show_message "extract replacement component -> $RESOURCES_PATH/replacement..." + tar -xzf $filelink -C "$RESOURCES_PATH/replacement" local replacefiles=("IconResources.idx" "PSIconsHighRes.dat" "PSIconsLowRes.dat") local destpath="$WINE_PREFIX/drive_c/users/$USER/PhotoshopSE/Resources" @@ -90,21 +85,14 @@ function replacement() { done show_message "replace component compeleted..." - unset filename filemd5 filelink filepath } function install_photoshopSE() { - local filename="photoshopCC-V19.1.6-2018x64.tgz" - local filemd5="b63f6ed690343ee12b6195424f94c33f" - local filelink="https://victor.poshtiban.io/p/gictor/photoshopCC/photoshopCC-V19.1.6-2018x64.tgz" - # local filelink="http://127.0.0.1:8080/photoshopCC-V19.1.6-2018x64.tgz" - local filepath="$CACHE_PATH/$filename" - - download_component $filepath $filemd5 $filelink $filename - + local filelink="/home/$USER/Downloads/photoshopCC/photoshopCC-V19.1.6-2018x64.tgz" + mkdir "$RESOURCES_PATH/photoshopCC" - show_message "extract photoshop..." - tar -xzf "$filepath" -C "$RESOURCES_PATH/photoshopCC" + show_message "extract photoshop -> $RESOURCES_PATH/photoshopCC..." + tar -xzf "$filelink" -C "$RESOURCES_PATH/photoshopCC" echo "===============| photoshop CC v19 |===============" >> "$SCR_PATH/wine-error.log" show_message "install photoshop..." @@ -117,7 +105,6 @@ function install_photoshopSE() { notify-send "Photoshop CC" "photoshop installed successfully" -i "photoshop" show_message "photoshopCC V19 x64 installed..." - unset filename filemd5 filelink filepath } check_arg $@ From 1a95809bc5d55b4632c0f414138cf21c3cc553f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=E1=BA=BF=20Trung?= Date: Sat, 14 Dec 2024 21:34:49 +0700 Subject: [PATCH 3/4] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 1127ca9..f70a931 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ # Photoshop CC v19 installer for Linux This bash script helps you to install Photoshop CC version 19 on your Linux machine using wine behind the scene and sets some necessary components up for the best performance +## Update in 14th December, 2024 +- *silent* during winetricks +- use local files ( replacement & photoshopCC ) instead downloading from host. +- use `wine` instead of `wine64` in both `launcher.sh` & install bash scripts. ## :rocket: Features * downloads necessary components and installs them (`vcrun`, `atmlib`, `msxml`...) From 9e71ed30290ba4b1d5898baa785de94ba160a3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=E1=BA=BF=20Trung?= Date: Sat, 14 Dec 2024 21:35:40 +0700 Subject: [PATCH 4/4] use wine instead of wine64 --- scripts/PhotoshopSetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/PhotoshopSetup.sh b/scripts/PhotoshopSetup.sh index 16c08de..69e579d 100755 --- a/scripts/PhotoshopSetup.sh +++ b/scripts/PhotoshopSetup.sh @@ -98,7 +98,7 @@ function install_photoshopSE() { show_message "install photoshop..." show_message "\033[1;33mPlease don't change default Destination Folder\e[0m" - wine64 "$RESOURCES_PATH/photoshopCC/photoshop_cc.exe" &>> "$SCR_PATH/wine-error.log" || error "sorry something went wrong during photoshop installation" + wine "$RESOURCES_PATH/photoshopCC/photoshop_cc.exe" &>> "$SCR_PATH/wine-error.log" || error "sorry something went wrong during photoshop installation" show_message "removing useless helper.exe plugin to avoid errors" rm "$WINE_PREFIX/drive_c/users/$USER/PhotoshopSE/Required/Plug-ins/Spaces/Adobe Spaces Helper.exe"