Changes for POL_Remove_gfwl

Revision by petch (23 January 2013 00:13:51)

@@ -1,16 +1,18 @@
 #!/bin/bash
 # Date : (2011-08-18 21:00)
-# Last revision : (2011-08-19 21:00)
+# Last revision : (2013-01-23 00:13)
 # Author : GNU_Raziel
 # Only For : http://www.playonlinux.com
 
 # Checking if GFWL is installed
-if [ -e "$WINEPREFIX/drive_c/windows/system32/xlive/sqmapi.dll" ] || [ -e "$WINEPREFIX/drive_c/windows/syswow64/xlive/sqmapi.dll" ]; then
-	# Downloading GFW
-	cd "$POL_USER_ROOT/ressources"
-	if [ ! -e "xliveredist.msi" ]; then
-		POL_SetupWindow_download "$(eval_gettext 'Downloading Game For Windows Live...')" "$TITLE" "http://download.microsoft.com/download/D/6/0/D60F0E11-CF52-42B9-A13A-E7DAB124F08F/xliveredist.msi"
-	fi
+if [ -e "$WINEPREFIX/drive_c/windows/system32/xlive/sqmapi.dll" -o -e "$WINEPREFIX/drive_c/windows/syswow64/xlive/sqmapi.dll" ]; then
+	# Downloading GFWL
+	# Since we cannot validate the file with a hash (changes too often), do not put it into resources
+	# Otherwise in case of corrupted download, the only solution for the user is to clean his cache
+	# Download is not that large anyway (~22MB)
+	cd "$POL_USER_ROOT/tmp"
+	POL_SetupWindow_download "$(eval_gettext 'Downloading Game For Windows Live...')" "$TITLE" "http://download.microsoft.com/download/D/6/0/D60F0E11-CF52-42B9-A13A-E7DAB124F08F/xliveredist.msi"
+
 	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live...')" "$TITLE"
 	# Product codes are located in [HKEY_LOCAL_MACHINE/Software/Microsoft/Windows/Current/Version/Uninstall]
 	POL_Wine msiexec /uninstall xliveredist.msi /q

Revision by petch (15 September 2012 22:16:10)

No change were made in the code

Revision by GNU_Raziel (19 August 2011 13:59:12)

@@ -15,8 +15,6 @@
 	# Product codes are located in [HKEY_LOCAL_MACHINE/Software/Microsoft/Windows/Current/Version/Uninstall]
 	POL_Wine msiexec /uninstall xliveredist.msi /q
 
-#MsiExec.exe /I{FD052FB9-FE90-4438-B355-15EDC89D8FB1}
-
 	# Removing dll Override
 	POL_Wine_OverrideDLL "builtin" "xlive"
 else

Revision by GNU_Raziel (19 August 2011 13:34:24)

@@ -5,11 +5,17 @@
 # Only For : http://www.playonlinux.com
 
 # Checking if GFWL is installed
-if [ -e "$WINEPREFIX/drive_c/windows/system32/xlive/sqmapi.dll" ]; then
+if [ -e "$WINEPREFIX/drive_c/windows/system32/xlive/sqmapi.dll" ] || [ -e "$WINEPREFIX/drive_c/windows/syswow64/xlive/sqmapi.dll" ]; then
+	# Downloading GFW
+	cd "$POL_USER_ROOT/ressources"
+	if [ ! -e "xliveredist.msi" ]; then
+		POL_SetupWindow_download "$(eval_gettext 'Downloading Game For Windows Live...')" "$TITLE" "http://download.microsoft.com/download/D/6/0/D60F0E11-CF52-42B9-A13A-E7DAB124F08F/xliveredist.msi"
+	fi
 	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live...')" "$TITLE"
 	# Product codes are located in [HKEY_LOCAL_MACHINE/Software/Microsoft/Windows/Current/Version/Uninstall]
-	POL_Wine msiexec /uninstall {4CB0307C-565E-4441-86BE-0DF2E4FB828C} /q
-	POL_Wine msiexec /uninstall {F2508213-9989-4E85-A078-72BE483917EF} /q
+	POL_Wine msiexec /uninstall xliveredist.msi /q
+
+#MsiExec.exe /I{FD052FB9-FE90-4438-B355-15EDC89D8FB1}
 
 	# Removing dll Override
 	POL_Wine_OverrideDLL "builtin" "xlive"

Revision by GNU_Raziel (19 August 2011 12:33:08)

@@ -1,24 +1,18 @@
 #!/bin/bash
 # Date : (2011-08-18 21:00)
-# Last revision : (2011-08-18 21:00)
+# Last revision : (2011-08-19 21:00)
 # Author : GNU_Raziel
 # Only For : http://www.playonlinux.com
 
 # Checking if GFWL is installed
 if [ -e "$WINEPREFIX/drive_c/windows/system32/xlive/sqmapi.dll" ]; then
-	# Downloading GFW
-	cd "$POL_USER_ROOT/ressources"
-	if [ ! -e "gfwlivesetup.exe" ]; then
-	POL_SetupWindow_download "$(eval_gettext 'Downloading Game For Windows Live...')" "$TITLE" "http://download.gfwl.xboxlive.com/content/gfwl-public/redists/production/gfwlivesetup.exe"
-	fi
-
 	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live...')" "$TITLE"
 	# Product codes are located in [HKEY_LOCAL_MACHINE/Software/Microsoft/Windows/Current/Version/Uninstall]
 	POL_Wine msiexec /uninstall {4CB0307C-565E-4441-86BE-0DF2E4FB828C} /q
 	POL_Wine msiexec /uninstall {F2508213-9989-4E85-A078-72BE483917EF} /q
 
 	# Removing dll Override
-	POL_Wine_OverrideDLL "builtin,native" "xlive"
+	POL_Wine_OverrideDLL "builtin" "xlive"
 else
 	POL_SetupWindow_message "$(eval_gettext 'Game For Windows Live is not installed\nskipping uninstall routine.')" "$TITLE"
 fi
\ No newline at end of file

Revision by GNU_Raziel (18 August 2011 23:59:30)

@@ -14,8 +14,8 @@
 
 	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live...')" "$TITLE"
 	# Product codes are located in [HKEY_LOCAL_MACHINE/Software/Microsoft/Windows/Current/Version/Uninstall]
-	POL_Wine msiexec /uninstall{4CB0307C-565E-4441-86BE-0DF2E4FB828C} /q
-	POL_Wine msiexec /uninstall{F2508213-9989-4E85-A078-72BE483917EF} /q
+	POL_Wine msiexec /uninstall {4CB0307C-565E-4441-86BE-0DF2E4FB828C} /q
+	POL_Wine msiexec /uninstall {F2508213-9989-4E85-A078-72BE483917EF} /q
 
 	# Removing dll Override
 	POL_Wine_OverrideDLL "builtin,native" "xlive"

Revision by GNU_Raziel (18 August 2011 23:58:23)

@@ -12,8 +12,10 @@
 	POL_SetupWindow_download "$(eval_gettext 'Downloading Game For Windows Live...')" "$TITLE" "http://download.gfwl.xboxlive.com/content/gfwl-public/redists/production/gfwlivesetup.exe"
 	fi
 
-	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live using setup uninstall feature...')" "$TITLE"
-	POL_Wine gfwlivesetup.exe /uninstall
+	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live...')" "$TITLE"
+	# Product codes are located in [HKEY_LOCAL_MACHINE/Software/Microsoft/Windows/Current/Version/Uninstall]
+	POL_Wine msiexec /uninstall{4CB0307C-565E-4441-86BE-0DF2E4FB828C} /q
+	POL_Wine msiexec /uninstall{F2508213-9989-4E85-A078-72BE483917EF} /q
 
 	# Removing dll Override
 	POL_Wine_OverrideDLL "builtin,native" "xlive"

Revision by GNU_Raziel (18 August 2011 23:27:32)

@@ -13,7 +13,7 @@
 	fi
 
 	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live using setup uninstall feature...')" "$TITLE"
-	POL_Wine gfwlivesetup.exe /uninstall /q
+	POL_Wine gfwlivesetup.exe /uninstall
 
 	# Removing dll Override
 	POL_Wine_OverrideDLL "builtin,native" "xlive"

Revision by GNU_Raziel (18 August 2011 23:23:14)

@@ -12,7 +12,7 @@
 	POL_SetupWindow_download "$(eval_gettext 'Downloading Game For Windows Live...')" "$TITLE" "http://download.gfwl.xboxlive.com/content/gfwl-public/redists/production/gfwlivesetup.exe"
 	fi
 
-	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live using setup\'s uninstall feature...')" "$TITLE"
+	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live using setup uninstall feature...')" "$TITLE"
 	POL_Wine gfwlivesetup.exe /uninstall /q
 
 	# Removing dll Override

Revision by GNU_Raziel (18 August 2011 23:21:00)

@@ -12,7 +12,7 @@
 	POL_SetupWindow_download "$(eval_gettext 'Downloading Game For Windows Live...')" "$TITLE" "http://download.gfwl.xboxlive.com/content/gfwl-public/redists/production/gfwlivesetup.exe"
 	fi
 
-	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live using setup's uninstall feature...')" "$TITLE"
+	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live using setup\'s uninstall feature...')" "$TITLE"
 	POL_Wine gfwlivesetup.exe /uninstall /q
 
 	# Removing dll Override

Revision by GNU_Raziel (18 August 2011 23:07:07)

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Date : (2011-08-18 21:00)
+# Last revision : (2011-08-18 21:00)
+# Author : GNU_Raziel
+# Only For : http://www.playonlinux.com
+
+# Checking if GFWL is installed
+if [ -e "$WINEPREFIX/drive_c/windows/system32/xlive/sqmapi.dll" ]; then
+	# Downloading GFW
+	cd "$POL_USER_ROOT/ressources"
+	if [ ! -e "gfwlivesetup.exe" ]; then
+	POL_SetupWindow_download "$(eval_gettext 'Downloading Game For Windows Live...')" "$TITLE" "http://download.gfwl.xboxlive.com/content/gfwl-public/redists/production/gfwlivesetup.exe"
+	fi
+
+	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Remove Game For Windows Live using setup's uninstall feature...')" "$TITLE"
+	POL_Wine gfwlivesetup.exe /uninstall /q
+
+	# Removing dll Override
+	POL_Wine_OverrideDLL "builtin,native" "xlive"
+else
+	POL_SetupWindow_message "$(eval_gettext 'Game For Windows Live is not installed\nskipping uninstall routine.')" "$TITLE"
+fi
\ No newline at end of file