wine3.4 and customScript removed switch to wine v5

scripts/PhotoshopSetup.sh

@@ -16,16 +16,9 @@ function main(){
     package_installed md5sum
     package_installed winetricks
 
-    #delete wine3.4 dir if exist then create it
-    WINE_PATH="$SCR_PATH/wine-3.4"
-    rmdir_if_exist $WINE_PATH
-
     RESOURCES_PATH="$SCR_PATH/resources"
     WINE_PREFIX="$SCR_PATH/prefix"
     
-    #install wine 3.4
-    install_wine34
-    
     #create new wine prefix for photoshop
     rmdir_if_exist $WINE_PREFIX
     
@@ -33,7 +26,7 @@ function main(){
     export_var
     
     #config wine prefix and install mono and gecko automatic
-    echo -e "\033[1;93mplease install mono and gecko packages then click on ok button\e[0m"
+    echo -e "\033[1;93mplease install mono and gecko packages then click on OK button\e[0m"
     winecfg 2> "$SCR_PATH/wine-error.log"
     if [ $? -eq 0 ];then
         show_message "prefix configured..."
@@ -43,9 +36,6 @@ function main(){
     fi
     
     if [ -f "$WINE_PREFIX/user.reg" ];then
-        #add necessary dlls
-        append_DLL
-        sleep 4
         #add dark mod
         set_dark_mod
     else
@@ -56,16 +46,13 @@ 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 vcrun2015 atmlib msxml3 msxml6
+    winetricks atmlib fontsmooth=rgb vcrun2008 vcrun2010 vcrun2012 vcrun2013 atmlib msxml3 msxml6
     
     #install photoshop
     sleep 3
     install_photoshopSE
     sleep 5
     
-    echo -e "\033[1;93mSelect \"Windows 7\" for windows version and then click OK\e[0m"
-    winecfg
-    
     replacement
 
     if [ -d $RESOURCES_PATH ];then

scripts/cameraRawInstaller.sh

@@ -4,7 +4,6 @@ function main(){
     source "sharedFuncs.sh"
 
     load_paths
-    WINE_PATH="$SCR_PATH/wine-3.4"
     WINE_PREFIX="$SCR_PATH/prefix"
 
     #resources will be remove after installation
@@ -17,7 +16,7 @@ function main(){
 }
 
 function check_ps_installed() {
-    ([ -d "$SCR_PATH" ] && [ -d "$CACHE_PATH" ] && [ -d "$WINE_PATH" ] && [ -d "$WINE_PREFIX" ] && show_message2 "photoshop installed") || error2 "photoshop not found you should intsall photoshop first"
+    ([ -d "$SCR_PATH" ] && [ -d "$CACHE_PATH" ] && [ -d "$WINE_PREFIX" ] && show_message2 "photoshop installed") || error2 "photoshop not found you should intsall photoshop first"
 }
 
 function install_cameraRaw() {

scripts/launcher.sh

@@ -6,23 +6,13 @@ fi
 
 notify-send "Photoshop CC started." -i "photoshop"
 
-# SCR_PATH="$HOME/.photoshopCCV19"
-# CACHE_PATH="$HOME/.cache/photoshopCCV19"
 SCR_PATH="pspath"
 CACHE_PATH="pscache"
 
-WINE_PATH="$SCR_PATH/wine-3.4"
-
 RESOURCES_PATH="$SCR_PATH/resources"
 WINE_PREFIX="$SCR_PATH/prefix"
  
 
 export WINEPREFIX="$WINE_PREFIX"
-export PATH="$WINE_PATH/bin:$PATH"
-export LD_LIBRARY_PATH="$WINE_PATH/lib:$LD_LIBRARY_PATH"
-#export WINEDLLOVERRIDES="winemenubuilder.exe=d"
-export WINESERVER="$WINE_PATH/bin/wineserver"
-export WINELOADER="$WINE_PATH/bin/wine"
-export WINEDLLPATH="$WINE_PATH/lib/wine"
 
 wine "$SCR_PATH/prefix/drive_c/users/$USER/PhotoshopSE/Photoshop.exe"

scripts/sharedFuncs.sh

@@ -97,7 +97,6 @@ function launcher(){
 function replacement() {
     local filename="replacement.tgz"
     local filemd5="6441a8e77c082897a99c2b7b588c9ac4"
-    # local filelink="https://www.dropbox.com/s/17pv6aezl7wz6gs/replacement.tgz?dl=1"
     local filelink="https://victor.poshtiban.io/p/gictor/photoshopCC/replacement.tgz"
     local filepath="$CACHE_PATH/$filename"
 
@@ -122,7 +121,6 @@ function replacement(){
 function install_photoshopSE() {
     local filename="photoshopCC-V19.1.6-2018x64.tgz"
     local filemd5="b63f6ed690343ee12b6195424f94c33f"
-    # local filelink="https://www.dropbox.com/s/dwfyzq2ie6jih7g/photoshopCC-V19.1.6-2018x64.tgz?dl=1"
     local filelink="https://victor.poshtiban.io/p/gictor/photoshopCC/photoshopCC-V19.1.6-2018x64.tgz"
     local filepath="$CACHE_PATH/$filename"
 
@@ -186,73 +184,9 @@ function set_dark_mod(){
     unset colorarray
 }
 
-function append_DLL(){ 
-    local dllarray=(
-        '[Software\\Wine\\DllOverrides] 1580889458'
-        '#time=1d5dbf9ef00b116'
-        '"*atl110"="native,builtin"'
-        '"*atl120"="native,builtin"'
-        '"*msvcp110"="native,builtin"'
-        '"*msvcp120"="native,builtin"'
-        '"*msvcr100"="native,builtin"'
-        '"*msvcr110"="native,builtin"'
-        '"*msvcr120"="native,builtin"'
-        '"*msvcr90"="native,builtin"'
-        '"*msxml3"="native"'
-        '"*msxml6"="native"'
-        '"*vcomp110"="native,builtin"'
-        '"*vcomp120"="native,builtin"'
-        '"atl110"="native,builtin"'
-        '"atl80"="native,builtin"'
-        '"atl90"="native,builtin"'
-        '"msvcp100"="native,builtin"'
-        '"msvcp110"="native,builtin"'
-        '"msvcp120"="native,builtin"'
-        '"msvcr100"="native,builtin"'
-        '"msvcr110"="native,builtin"'
-        '"msvcr120"="native,builtin"'
-        '"msvcr90"="native,builtin"'
-        '"msxml3"="native,builtin"'
-        '"msxml6"="native,builtin"'
-        '"vcomp110"="native,builtin"'
-        '"vcomp120"="native,builtin"' 
-    )
-    show_message "add necessary DLLs..."
-    echo " " >> "$WINE_PREFIX/user.reg"
-    for i in ${dllarray[@]};do
-        echo "$i" >> "$WINE_PREFIX/user.reg"
-    done
-    unset dllarray
-}
-
 function export_var() {
     export WINEPREFIX="$WINE_PREFIX"
-    export PATH="$WINE_PATH/bin:$PATH"
-    export LD_LIBRARY_PATH="$WINE_PATH/lib:$LD_LIBRARY_PATH"
-    export WINEDLLOVERRIDES="winemenubuilder.exe=d"
-    export WINESERVER="$WINE_PATH/bin/wineserver"
-    export WINELOADER="$WINE_PATH/bin/wine"
-    export WINEDLLPATH="$WINE_PATH/lib/wine"
-    
     show_message "wine variables exported..."
-    local wine_version=$(wine --version)
-    
-    if [ "$wine_version" == "wine-3.4" ];then
-        show_message "wine 3.4 is configured..."
-    else
-        error "wine 3.4 config is wrong"
-    fi
-}
-
-function install_wine34(){
-    local filename="wine-3.4.tgz"
-    local filepath="$CACHE_PATH/$filename" 
-    local filemd5="72b485c28e40bba2b73b0d4c0c29a15f" 
-    local filelink="http://www.playonlinux.com/wine/binaries/phoenicis/upstream-linux-amd64/PlayOnLinux-wine-3.4-upstream-linux-amd64.tar.gz"
-    download_component $filepath $filemd5 $filelink $filename 
-    tar -xzf "$filepath" -C "$WINE_PATH"
-    show_message "wine 3.4 installed..."
-    unset filename filepath filemd5 filelink
 }
 
 #parameters is [PATH] [CheckSum] [URL] [FILE NAME]

scripts/winecfg.sh

@@ -3,16 +3,9 @@ source "sharedFuncs.sh"
 
 function main(){
     load_paths 
-    WINE_PATH="$SCR_PATH/wine-3.4" 
     RESOURCES_PATH="$SCR_PATH/resources"
     WINE_PREFIX="$SCR_PATH/prefix"
     export WINEPREFIX="$WINE_PREFIX"
-    export PATH="$WINE_PATH/bin:$PATH"
-    export LD_LIBRARY_PATH="$WINE_PATH/lib:$LD_LIBRARY_PATH"
-    #export WINEDLLOVERRIDES="winemenubuilder.exe=d"
-    export WINESERVER="$WINE_PATH/bin/wineserver"
-    export WINELOADER="$WINE_PATH/bin/wine"
-    export WINEDLLPATH="$WINE_PATH/lib/wine"
     winecfg
 }