diff --git a/src/ConceptDeploy/ConceptDeploy.psd1 b/src/ConceptDeploy/ConceptDeploy.psd1 index 4a86e2d..87004b2 100644 Binary files a/src/ConceptDeploy/ConceptDeploy.psd1 and b/src/ConceptDeploy/ConceptDeploy.psd1 differ diff --git a/src/InstallAllProducts.ps1 b/src/InstallAllProducts.ps1 index f6003ae..1600861 100644 --- a/src/InstallAllProducts.ps1 +++ b/src/InstallAllProducts.ps1 @@ -4,8 +4,7 @@ Set-Variable -Name OFFICE_REGISTRY -Value 'HKCU:\SOFTWARE\Microsoft\Office\16.0' -Option Constant Set-Variable -Name DOMAINS_REGISTRY -Value 'HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\Domains' -Option Constant Set-Variable -Name SERVER_PATH -Value '\\fs1.concept.ru\' -Option Constant -Set-Variable -Name TEMPLATES_PATH -Value "$Env:APPDATA\Microsoft\Шаблоны" -Option Constant -Set-Variable -Name TEMPLATES_NORMAL_PATH -Value "$Env:APPDATA\Microsoft\Templates" -Option Constant +Set-Variable -Name TEMPLATES_PATH -Value "$Env:APPDATA\Microsoft\Templates" -Option Constant $word = If (Test-Path "${OFFICE_REGISTRY}\Word") {"${OFFICE_REGISTRY}\Word"} Else {''} $excel = If (Test-Path "${OFFICE_REGISTRY}\Excel") {"${OFFICE_REGISTRY}\Excel"} Else {''} @@ -56,8 +55,6 @@ function InstallAllProducts { Write-Host "Update templates at ${TEMPLATES_PATH}" -ForegroundColor DarkGreen UpdateTemplates "${distr}\data\Templates" $TEMPLATES_PATH $localHome - Copy-Item -Path "${TEMPLATES_PATH}\Normal.dotm" -Destination "${TEMPLATES_NORMAL_PATH}\Normal.dotm" - Copy-Item -Path "${TEMPLATES_PATH}\NormalEmail.dotm" -Destination "${TEMPLATES_NORMAL_PATH}\NormalEmail.dotm" Write-Host "`nUpdating products..." -ForegroundColor DarkGreen UpdateProducts $distr $TEMPLATES_PATH $localHome @@ -337,7 +334,7 @@ function AddTrustedLocation($target, $location) { $folder = "${registryPath}\Location${index}" New-Item -Path $folder -ItemType Directory | Out-Null New-ItemProperty -Path $folder -Name 'Path' -Value $location | Out-Null - New-ItemProperty -Path $folder -Name 'Description' -Value 'Сетевой путь КОНЦЕПТ' | Out-Null + New-ItemProperty -Path $folder -Name 'Description' -Value 'CIHT Concept Network' | Out-Null New-ItemProperty -Path $folder -Name 'AllowSubfolders' -Value 1 | Out-Null return $true } diff --git a/src/UninstallConceptProducts.ps1 b/src/UninstallConceptProducts.ps1 index aa97b6e..8330a89 100644 --- a/src/UninstallConceptProducts.ps1 +++ b/src/UninstallConceptProducts.ps1 @@ -117,7 +117,7 @@ function PrepareExternalProcesses { function GetTemplatesFolder { $officeRK = 'HKCU:\SOFTWARE\Microsoft\Office\16.0' - $defaultTemplates = "$($Env:APPDATA)\Microsoft\Шаблоны" + $defaultTemplates = "$($Env:APPDATA)\Microsoft\Templates" $templates = Get-ItemPropertyValue -Path "$officeRK\Word\Options" -Name 'PersonalTemplates' -ErrorAction 'SilentlyContinue' if (!$templates -or [string]::IsNullOrWhiteSpace($templates)) {