From e46ebfb242d09a143cc260d0371bf222ba426253 Mon Sep 17 00:00:00 2001
From: Boria138 <boriabloger@protonmail.com>
Date: Thu, 25 Jan 2024 19:08:58 +0600
Subject: [PATCH 1/6] Rewrite create shortcut for work with flatpak

---
 data_from_portwine/scripts/zen_yad_gui | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui
index 8170d92f..ad56fd4b 100755
--- a/data_from_portwine/scripts/zen_yad_gui
+++ b/data_from_portwine/scripts/zen_yad_gui
@@ -655,7 +655,10 @@ portwine_create_shortcut () {
 
         echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
         echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-        echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+        if [[ $(cat /etc/os-release | grep -i "flatpak" )  ]]
+        then echo "Exec="flatpak run com.castrofidel.portproton \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+        else echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+        fi
         echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
         echo "Categories=Game" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
         echo "StartupNotify=true" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
@@ -679,7 +682,10 @@ portwine_create_shortcut () {
             echo "#!/usr/bin/env bash" > "${STEAM_SCRIPTS}/${name_desktop}.sh"
             echo "export START_FROM_STEAM=1" >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
             echo "export LD_PRELOAD=" >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
-            echo "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" " >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
+            if [[ $(cat /etc/os-release | grep -i "flatpak" )  ]]
+            then echo "flatpak run com.castrofidel.portproton \"${portwine_exe}\" " >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
+            else echo "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" " >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
+            fi
             chmod u+x "${STEAM_SCRIPTS}/${name_desktop}.sh"
             "${PORT_SCRIPTS_PATH}/add_in_steam.sh"
             if [[ "${PW_SKIP_RESTART_STEAM}" != 1 ]] && pgrep -i steam &>/dev/null ; then

From d8a463104f2f1aa244a17d9480b7db8444d97c4a Mon Sep 17 00:00:00 2001
From: Boria138 <boriabloger@protonmail.com>
Date: Thu, 25 Jan 2024 20:04:05 +0600
Subject: [PATCH 2/6] Change wget to curl and zenity to yad (tested design)

---
 data_from_portwine/scripts/functions_helper | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index b8fbeea7..6a0d4f4a 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -133,17 +133,17 @@ try_download_game () {
 try_download () {
     PW_DOWNLOAD_FILE_NAME="$(basename $1)"
     set -o pipefail
-    wget -c -O "$2" --read-timeout 300 --retry-connrefused --timeout 3 --tries 2 --no-dns-cache --no-cache \
-    --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \
-    tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \
-    zenity --progress --percentage=0 --title="Download ${PW_DOWNLOAD_FILE_NAME}" --text=Starting... --auto-close --width=500 --height=90
+    curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "$1" -o "$2" 2>&1 | \
+    tr '\r' '\n' | sed -u -e 's/#//g' -e 's/ //g' -e 's/\.[[:digit:]]%//' | \
+    "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \
+                --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90
     if [ "${PIPESTATUS[0]}" != 0 ] ; then
         print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from GitHub."
         print_info "Try download ${PW_DOWNLOAD_FILE_NAME} from FTP"
-        wget -c -O "$2" --read-timeout 300 --retry-connrefused --timeout 3 --tries 2 --no-dns-cache --no-cache \
-        --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" --ftp-user=anonymous "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" 2>&1 | \
-        tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \
-        zenity --progress --percentage=0 --title="Try download ${PW_DOWNLOAD_FILE_NAME} from FTP" --text=Starting... --auto-close --width=500 --height=90
+        curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" -o "$2" 2>&1 | \
+        tr '\r' '\n' | sed -u -e 's/#//g' -e 's/ //g' -e 's/\.[[:digit:]]%//' | \
+        "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \
+                --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90
         if [ "${PIPESTATUS[0]}" != 0 ] ; then
             print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from FTP."
             return 1   
@@ -154,11 +154,12 @@ try_download () {
 }
 
 try_download_to_path () {
+    PW_DOWNLOAD_FILE_NAME="$(basename $1)"
     set -o pipefail
-    wget --directory-prefix="$2" --read-timeout 300 --retry-connrefused --timeout 4 --tries 2 --no-dns-cache --no-cache \
-    --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \
-    tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \
-    zenity --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --width=500 --height=90
+    curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" 2>&1 | \
+    tr '\r' '\n' | sed -u -e 's/#//g' -e 's/ //g' -e 's/\.[[:digit:]]%//' | \
+    "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \
+                --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90
     if [ "${PIPESTATUS[0]}" != 0 ] ; then
         print_error "Failed to download $1."
         return 1 
@@ -168,8 +169,7 @@ try_download_to_path () {
 }
 
 try_download_silent () {
-    wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 4 --tries 2 --no-dns-cache --no-cache \
-    --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1"
+    curl -sS -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "$1" -o "$2"
     if [ "${PIPESTATUS[0]}" != 0 ] ; then
         print_error "Failed to download $1. Skipping."
         try_remove_file "$2"

From 8835cdd5ae8f27f3b008d3f28f7523ad4a805948 Mon Sep 17 00:00:00 2001
From: Boria138 <boriabloger@protonmail.com>
Date: Fri, 26 Jan 2024 11:07:33 +0600
Subject: [PATCH 3/6] Fixed PW_EXEC_FROM_DESKTOP=

---
 data_from_portwine/scripts/start.sh    | 8 ++++++--
 data_from_portwine/scripts/zen_yad_gui | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index a2aedffd..144ff511 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -655,12 +655,16 @@ else
         if [[ ! -z $(pidof -s yad) ]] || [[ ! -z $(pidof -s yad_v12_3) ]] ; then
             kill -s SIGUSR1 $(pgrep -a yad | grep "\--key=${KEY} \--notebook" | awk '{print $1}') > /dev/null 2>&1
         fi
-        PW_EXEC_FROM_DESKTOP="$(cat "${PORT_WINE_PATH}/${PW_YAD_SET//¬/" "}" | grep Exec | head -n 1 | awk -F"=env " '{print $2}')"
+
+        if [[ $(cat /etc/os-release | grep -i "flatpak") ]] ;
+        then PW_EXEC_FROM_DESKTOP="$(cat "${PORT_WINE_PATH}/${PW_YAD_SET//¬/" "}" | grep Exec | head -n 1 | sed 's|flatpak run com.castrofidel.portproton|\"${PORT_SCRIPTS_PATH}/start.sh\"|' | awk -F'=' '{print $2}')"
+        else PW_EXEC_FROM_DESKTOP="$(cat "${PORT_WINE_PATH}/${PW_YAD_SET//¬/" "}" | grep Exec | head -n 1 | awk -F"=env " '{print $2}')"
+        fi
 
         print_info "Restarting PP after choose desktop file..."
         # stop_portwine
         /usr/bin/env bash -c "${PW_EXEC_FROM_DESKTOP}" &
-        exit 0 
+        exit 0
     }
     export -f run_desktop_b_click
 
diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui
index ad56fd4b..4341e464 100755
--- a/data_from_portwine/scripts/zen_yad_gui
+++ b/data_from_portwine/scripts/zen_yad_gui
@@ -655,7 +655,7 @@ portwine_create_shortcut () {
 
         echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
         echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-        if [[ $(cat /etc/os-release | grep -i "flatpak" )  ]]
+        if [[ $(cat /etc/os-release | grep -i "flatpak")  ]]
         then echo "Exec="flatpak run com.castrofidel.portproton \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
         else echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
         fi
@@ -682,9 +682,9 @@ portwine_create_shortcut () {
             echo "#!/usr/bin/env bash" > "${STEAM_SCRIPTS}/${name_desktop}.sh"
             echo "export START_FROM_STEAM=1" >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
             echo "export LD_PRELOAD=" >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
-            if [[ $(cat /etc/os-release | grep -i "flatpak" )  ]]
-            then echo "flatpak run com.castrofidel.portproton \"${portwine_exe}\" " >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
-            else echo "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" " >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
+            if [[ $(cat /etc/os-release | grep -i "flatpak")  ]]
+            then echo "Exec="flatpak run com.castrofidel.portproton \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+            else echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
             fi
             chmod u+x "${STEAM_SCRIPTS}/${name_desktop}.sh"
             "${PORT_SCRIPTS_PATH}/add_in_steam.sh"

From 30ac7a6e60114ea490deb0e10fe94d2450cb8fd9 Mon Sep 17 00:00:00 2001
From: Boria138 <boriabloger@protonmail.com>
Date: Fri, 26 Jan 2024 19:18:15 +0600
Subject: [PATCH 4/6] Fixed steam shortcuts

---
 data_from_portwine/scripts/zen_yad_gui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui
index 4341e464..d3c378fd 100755
--- a/data_from_portwine/scripts/zen_yad_gui
+++ b/data_from_portwine/scripts/zen_yad_gui
@@ -656,7 +656,7 @@ portwine_create_shortcut () {
         echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
         echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
         if [[ $(cat /etc/os-release | grep -i "flatpak")  ]]
-        then echo "Exec="flatpak run com.castrofidel.portproton \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+        then echo "Exec=flatpak run com.castrofidel.portproton \"${portwine_exe}\" " >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
         else echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
         fi
         echo "Type=Application" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
@@ -683,8 +683,8 @@ portwine_create_shortcut () {
             echo "export START_FROM_STEAM=1" >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
             echo "export LD_PRELOAD=" >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
             if [[ $(cat /etc/os-release | grep -i "flatpak")  ]]
-            then echo "Exec="flatpak run com.castrofidel.portproton \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-            else echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+            then echo "flatpak run com.castrofidel.portproton \"${portwine_exe}\" " >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
+            else echo "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" " >> "${STEAM_SCRIPTS}/${name_desktop}.sh"
             fi
             chmod u+x "${STEAM_SCRIPTS}/${name_desktop}.sh"
             "${PORT_SCRIPTS_PATH}/add_in_steam.sh"

From cf9ec3e71ae28c34159ef17b39deab0e44073ebc Mon Sep 17 00:00:00 2001
From: Boria138 <boriabloger@protonmail.com>
Date: Mon, 29 Jan 2024 14:24:44 +0600
Subject: [PATCH 5/6] Added no cache to curl

---
 data_from_portwine/scripts/functions_helper | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 645481f6..0b3ad994 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -118,10 +118,10 @@ try_download_game () {
     [[ -f "${PW_AUTOINSTALL_EXE}" ]] && try_remove_file "${PW_AUTOINSTALL_EXE}"
     PW_DOWNLOAD_FILE_NAME="$(basename $1)"
     set -o pipefail
-    wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 3 --tries 2 --no-dns-cache --no-cache \
-    --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \
-    tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \
-    zenity --progress --percentage=0 --title="Download ${PW_DOWNLOAD_FILE_NAME}" --text=Starting... --auto-close --width=500 --height=90
+    curl -C - -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \
+    tr '\r' '\n' | sed -u -e 's/#//g' -e 's/ //g' -e 's/\.[[:digit:]]%//' | \
+    "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \
+                --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90
     if [ "${PIPESTATUS[0]}" != 0 ] ; then
         print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME}."
         return 1   
@@ -133,7 +133,7 @@ try_download_game () {
 try_download () {
     PW_DOWNLOAD_FILE_NAME="$(basename $1)"
     set -o pipefail
-    curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "$1" -o "$2" 2>&1 | \
+    curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \
     tr '\r' '\n' | sed -u -e 's/#//g' -e 's/ //g' -e 's/\.[[:digit:]]%//' | \
     "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \
                 --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90
@@ -156,7 +156,7 @@ try_download () {
 try_download_to_path () {
     PW_DOWNLOAD_FILE_NAME="$(basename $1)"
     set -o pipefail
-    curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" 2>&1 | \
+    curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" 2>&1 | \
     tr '\r' '\n' | sed -u -e 's/#//g' -e 's/ //g' -e 's/\.[[:digit:]]%//' | \
     "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \
                 --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90
@@ -169,7 +169,7 @@ try_download_to_path () {
 }
 
 try_download_silent () {
-    curl -sS -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "$1" -o "$2"
+    curl -sS -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2"
     if [ "${PIPESTATUS[0]}" != 0 ] ; then
         print_error "Failed to download $1. Skipping."
         try_remove_file "$2"

From 6aed9c3a62852c3f2c91409678fdfe14f8bf3b56 Mon Sep 17 00:00:00 2001
From: Boria138 <boriabloger@protonmail.com>
Date: Thu, 1 Feb 2024 15:07:39 +0600
Subject: [PATCH 6/6] Update setup.sh for flatpak

---
 data_from_portwine/scripts/setup.sh | 46 ++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/data_from_portwine/scripts/setup.sh b/data_from_portwine/scripts/setup.sh
index 13c8fb46..c9295a19 100755
--- a/data_from_portwine/scripts/setup.sh
+++ b/data_from_portwine/scripts/setup.sh
@@ -2,30 +2,48 @@
 # Author: linux-gaming.ru
 . "$(dirname $(readlink -f "$0"))/runlib"
 
-name_desktop="PortProton"
-echo "[Desktop Entry]"	 					  > "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Name=${name_desktop}" 				 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Exec=env "${PORT_SCRIPTS_PATH}/start.sh %F""	 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Type=Application" 					 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Terminal=False" 						 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Categories=Game"	    				 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "StartupNotify=true" 	    			 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "MimeType=application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program"  >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Path="${PORT_SCRIPTS_PATH}/""			 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Icon="${PORT_WINE_PATH}/data/img/w.png""   	 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
+if [[ $(cat /etc/os-release | grep -i "flatpak")  ]] ; then
+	name_desktop="PortProton"
+	echo "[Desktop Entry]"	 					  		 > "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Name=${name_desktop}" 				 		 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Exec=flatpak run com.castrofidel.portproton"	 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Type=Application" 						 	 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Terminal=False" 						 		 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Categories=Game"	    				 		 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "StartupNotify=true" 	    			 		 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "MimeType=application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program"  >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Path="${PORT_SCRIPTS_PATH}/""			 		 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Icon="${PORT_WINE_PATH}/data/img/w.png""   	 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
+else
+	name_desktop="PortProton"
+	echo "[Desktop Entry]"	 					  > "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Name=${name_desktop}" 				 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Exec=env "${PORT_SCRIPTS_PATH}/start.sh %F""	 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Type=Application" 					 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Terminal=False" 						 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Categories=Game"	    				 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "StartupNotify=true" 	    			 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "MimeType=application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program"  >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Path="${PORT_SCRIPTS_PATH}/""			 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	echo "Icon="${PORT_WINE_PATH}/data/img/w.png""   	 >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+	chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop"
+fi
 
 if [ -z "${PW_AUTOPLAY}" ] ; then
 	cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" ${HOME}/.local/share/applications/
 fi
 
 update-desktop-database -q "${HOME}/.local/share/applications"
-xdg-mime default PortProton.desktop "application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program"
+
+if [[ ! $(cat /etc/os-release | grep -i "flatpak")  ]]
+	xdg-mime default PortProton.desktop "application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program"
+fi
 
 name_desktop="readme"
 echo "[Desktop Entry]"				 > "${PORT_WINE_PATH}/${name_desktop}.desktop"
 echo "Name=${name_desktop}"			>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
-echo "Version=1.0"					>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
+echo "Version=1.3"					>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
 echo "Type=Link"					>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
 echo "Icon="${PORT_WINE_PATH}/data/img/readme.png""	>> "${PORT_WINE_PATH}/${name_desktop}.desktop"
 echo "URL=${urlg}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"