From ce4a2933308f65b619971c0bc01b60d28fa17407 Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Tue, 4 Apr 2023 08:58:13 +0200
Subject: [PATCH] modify the old spotx script to the new blockthespot (#4)

---
 Makefile                 |  2 +-
 windows/blockthespot.bat | 16 ++++++++++++++++
 windows/spotx.bat        | 21 ---------------------
 windows11.bat            |  2 +-
 4 files changed, 18 insertions(+), 23 deletions(-)
 create mode 100644 windows/blockthespot.bat
 delete mode 100644 windows/spotx.bat

diff --git a/Makefile b/Makefile
index fc1e87f..ea64fb3 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ sync-wsl:
 sync-windows:
 # Scripts
 	@$(WGET) $(REPO_SRC)/windows/ctmpf.bat -O $(WIN_HOME)/Documents/Local/ctmpf.bat
-	@$(WGET) https://raw.githubusercontent.com/mrpond/BlockTheSpot/master/simple.bat -O $(WIN_HOME)/Documents/Local/blockthespot.bat
+	@$(WGET) $(REPO_SRC)/windows/blockthespot.bat -O $(WIN_HOME)/Documents/Local/blockthespot.bat
 	@$(WGET) $(REPO_SRC)/windows/update.bat -O $(WIN_HOME)/Documents/Local/update.bat
 	@$(WGET) $(REPO_SRC)/windows/fix_nvidia_wsl.bat -O $(WIN_HOME)/Documents/Local/fix_nvidia_wsl.bat
 	@echo "(Windows) Scripts synced!"
diff --git a/windows/blockthespot.bat b/windows/blockthespot.bat
new file mode 100644
index 0000000..b09afb4
--- /dev/null
+++ b/windows/blockthespot.bat
@@ -0,0 +1,16 @@
+@ECHO off
+
+:: Patch spotify
+PowerShell -Command "[Net.ServicePointManager]::SecurityProtocol =" ^
+                    "[Net.SecurityProtocolType]::Tls12; Invoke-Expression """"&" ^
+                    "{ $(Invoke-WebRequest -UseBasicParsing" ^
+                    "'https://raw.githubusercontent.com/mrpond/BlockTheSpot/master/install.ps1')" ^
+                    "} -UninstallSpotifyStoreEdition -UpdateSpotify""""
+
+:: Delete newly created Spotify shortcut
+DEL %HOMEPATH%\Desktop\Spotify.lnk
+ie4uinit -show
+ECHO Raccourci sur le bureau detruit
+
+PAUSE
+EXIT /b
diff --git a/windows/spotx.bat b/windows/spotx.bat
deleted file mode 100644
index b2846f6..0000000
--- a/windows/spotx.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-:: NOT USED ANYMORE
-
-@ECHO off
-
-:: Patch spotify
-PowerShell -Command "&{[Net.ServicePointManager]::SecurityProtocol =" ^
-                    "[Net.SecurityProtocolType]::Tls12}; """"& {" ^
-                    "$((Invoke-WebRequest -UseBasicParsing" ^
-                    "'https://raw.githubusercontent.com/amd64fox/SpotX/main/Install.ps1').Content)}" ^
-                    "-confirm_uninstall_ms_spoti -confirm_spoti_recomended_over" ^
-                    "-podcasts_on -cache_on -block_update_off -start_spoti" ^
-                    "-hide_col_icon_off -new_theme -lyrics_stat purple" ^
-                    " """" | Invoke-Expression"
-
-:: Delete newly created Spotify shortcut
-DEL %HOMEPATH%\Desktop\Spotify.lnk
-ie4uinit -show
-ECHO Raccourci sur le bureau detruit
-
-PAUSE
-EXIT /b
diff --git a/windows11.bat b/windows11.bat
index d1d786c..bf752a8 100644
--- a/windows11.bat
+++ b/windows11.bat
@@ -114,7 +114,7 @@ PowerShell -Command "Install-Module -Name PSWindowsUpdate -Force"
 :: === Scripts ==
 MKDIR %HOMEPATH%\Documents\Local
 PowerShell -Command "Invoke-WebRequest -Uri https://git.mylloon.fr/Anri/confOS/raw/branch/main/windows/ctmpf.bat -OutFile '%HOMEPATH%\Documents\Local\ctmpf.bat'"
-PowerShell -Command "Invoke-WebRequest -Uri https://raw.githubusercontent.com/mrpond/BlockTheSpot/master/simple.bat -OutFile '%HOMEPATH%\Documents\Local\blockthespot.bat'"
+PowerShell -Command "Invoke-WebRequest -Uri https://git.mylloon.fr/Anri/confOS/raw/branch/main/windows/blockthespot.bat -OutFile '%HOMEPATH%\Documents\Local\blockthespot.bat'"
 PowerShell -Command "Invoke-WebRequest -Uri https://git.mylloon.fr/Anri/confOS/raw/branch/main/windows/update.bat -OutFile '%HOMEPATH%\Documents\Local\update.bat'"
 PowerShell -Command "Invoke-WebRequest -Uri https://git.mylloon.fr/Anri/confOS/raw/branch/main/windows/fix_nvidia_wsl.bat -OutFile '%HOMEPATH%\Documents\Local\fix_nvidia_wsl.bat'"