From 8f0f9702406405510b594f64d7254ee240f802a3 Mon Sep 17 00:00:00 2001
From: amd64fox <62529699+amd64fox@users.noreply.github.com>
Date: Sat, 9 Oct 2021 17:20:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B3-=D1=84=D0=B8=D0=BA=D1=81=20?=
 =?UTF-8?q?=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=87=D0=B5=D0=B3=D0=BE=20=D1=81=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Install_rus.ps1 | 58 ++++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/Install_rus.ps1 b/Install_rus.ps1
index 1b9949b..edd1fd0 100644
--- a/Install_rus.ps1
+++ b/Install_rus.ps1
@@ -222,6 +222,24 @@ Rename-Item -path $env:APPDATA\Spotify\Apps\xpui.zip -NewName $env:APPDATA\Spoti
 Remove-item $env:APPDATA\Spotify\Apps\temporary -Recurse
 
 
+# Если папки по умолчанию Dekstop не существует, то попытаться найти её через реестр.
+$ErrorActionPreference = 'SilentlyContinue' 
+
+if (Test-Path "$env:USERPROFILE\Desktop") {  
+
+    $desktop_folder = "$env:USERPROFILE\Desktop"
+    
+}
+
+$regedit_desktop_folder = Get-ItemProperty -Path "Registry::HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\"
+$regedit_desktop = $regedit_desktop_folder.'{754AC886-DF64-4CBA-86B5-F7FBF4FBCEF5}'
+ 
+if (!(Test-Path "$env:USERPROFILE\Desktop")) {
+    $desktop_folder = $regedit_desktop
+    
+}
+
+
 
 # Shortcut bug
 $ErrorActionPreference = 'SilentlyContinue' 
@@ -229,7 +247,7 @@ $ErrorActionPreference = 'SilentlyContinue'
 If (!(Test-Path $env:USERPROFILE\Desktop\Spotify.lnk)) {
   
     $source = "$env:APPDATA\Spotify\Spotify.exe"
-    $target = "$env:USERPROFILE\Desktop\Spotify.lnk"
+    $target = "$desktop_folder\Spotify.lnk"
     $WorkingDir = "$env:APPDATA\Spotify"
     $WshShell = New-Object -comObject WScript.Shell
     $Shortcut = $WshShell.CreateShortcut($target)
@@ -399,14 +417,10 @@ while ($ch -notmatch '^y$|^n$|^u$')
 
 if ($ch -eq 'y') {
 
-
+    
     $test_cache_spotify_ps = Test-Path -Path $env:APPDATA\Spotify\cache-spotify.ps1
     $test_spotify_vbs = Test-Path -Path $env:APPDATA\Spotify\Spotify.vbs
-    $desktop_folder = Get-ItemProperty -Path $env:USERPROFILE\Desktop | Select-Object Attributes 
-    
 
-    # Если папки по умолчанию Dekstop не существует, то установку кэша отменить.
-    if ($desktop_folder -match '\bDirectory\b') {  
 
 
 
@@ -425,17 +439,16 @@ if ($ch -eq 'y') {
         $webClient.DownloadFile('https://raw.githubusercontent.com/amd64fox/SpotX/main/Spotify.vbs', "$env:APPDATA\Spotify\Spotify.vbs")
 
 
-
-        # Spotify.lnk
-        $source2 = "$env:APPDATA\Spotify\Spotify.vbs"
-        $target2 = "$env:USERPROFILE\Desktop\Spotify.lnk"
-        $WorkingDir2 = "$env:APPDATA\Spotify"
-        $WshShell2 = New-Object -comObject WScript.Shell
-        $Shortcut2 = $WshShell2.CreateShortcut($target2)
-        $Shortcut2.WorkingDirectory = $WorkingDir2
-        $Shortcut2.IconLocation = "$env:APPDATA\Spotify\Spotify.exe"
-        $Shortcut2.TargetPath = $source2
-        $Shortcut2.Save()
+    # Spotify.lnk
+    $source2 = "$env:APPDATA\Spotify\Spotify.vbs"
+    $target2 = "$desktop_folder\Spotify.lnk"
+    $WorkingDir2 = "$env:APPDATA\Spotify"
+    $WshShell2 = New-Object -comObject WScript.Shell
+    $Shortcut2 = $WshShell2.CreateShortcut($target2)
+    $Shortcut2.WorkingDirectory = $WorkingDir2
+    $Shortcut2.IconLocation = "$env:APPDATA\Spotify\Spotify.exe"
+    $Shortcut2.TargetPath = $source2
+    $Shortcut2.Save()
 
 
 
@@ -474,14 +487,9 @@ if ($ch -eq 'y') {
             exit
         }
        
-    }
-
-    else {
-        Write-Host "Ошибка, не могу найти папку Рабочего стола" -ForegroundColor Red
-        Write-Host "Установка завершена" -ForegroundColor Green
     
-        Exit
-    }
+
+
 }
 
 if ($ch -eq 'n') {
@@ -500,7 +508,7 @@ if ($ch -eq 'u') {
         Remove-item $env:APPDATA\Spotify\Spotify.vbs -Recurse -Force
 
         $source3 = "$env:APPDATA\Spotify\Spotify.exe"
-        $target3 = "$env:USERPROFILE\Desktop\Spotify.lnk"
+        $target3 = "$desktop_folder\Spotify.lnk"
         $WorkingDir3 = "$env:APPDATA\Spotify"
         $WshShell3 = New-Object -comObject WScript.Shell
         $Shortcut3 = $WshShell3.CreateShortcut($target3)