Skip to content

Commit 93f9ff3

Browse files
author
pldmgg
committed
Minor updates
1 parent de46b21 commit 93f9ff3

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

MyFunctions/PowerShellCore_Compatible/Download-NuGetPackage.ps1

+16-19
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ function Download-NuGetPackage {
88
[string]$NuGetPkgDownloadDirectory,
99

1010
[Parameter(Mandatory=$False)]
11-
[switch]$AllowPreRelease
11+
[switch]$AllowPreRelease,
12+
13+
[Parameter(Mandatory=$False)]
14+
[switch]$Silent
1215
)
1316

1417
##### BEGIN Helper Native Functions #####
@@ -334,9 +337,13 @@ function Download-NuGetPackage {
334337
if ($($PSVersionTable.Platform -ne $null -and $PSVersionTable.Platform -ne "Win32NT") -or $NuGetPkgDownloadDirectory) {
335338
try {
336339
# Download the NuGet Package
337-
Write-Host "Downloading $AssemblyName NuGet Package to $NuGetPkgDownloadPath ..."
340+
if (!$Silent) {
341+
Write-Host "Downloading $AssemblyName NuGet Package to $NuGetPkgDownloadPath ..."
342+
}
338343
Invoke-WebRequest -Uri $NuGetPackageUri -OutFile $NuGetPkgDownloadPath
339-
Write-Host "NuGet Package has been downloaded to $NuGetPkgDownloadPath"
344+
if (!$Silent) {
345+
Write-Host "NuGet Package has been downloaded to $NuGetPkgDownloadPath"
346+
}
340347
}
341348
catch {
342349
Write-Error "Unable to find $AssemblyName via the NuGet API! Halting!"
@@ -346,7 +353,9 @@ function Download-NuGetPackage {
346353

347354
# Step through possble Zip File SubDirs and get the most highest available compatible version of the Assembly
348355
try {
349-
Write-Host "Attempting to extract NuGet zip file $NuGetPkgDownloadPath to $NuGetPkgExtractionDirectory ..."
356+
if (!$Silent) {
357+
Write-Host "Attempting to extract NuGet zip file $NuGetPkgDownloadPath to $NuGetPkgExtractionDirectory ..."
358+
}
350359
if ($(Get-ChildItem $NuGetPkgExtractionDirectory).Count -gt 1) {
351360
foreach ($item in $(Get-ChildItem $NuGetPkgExtractionDirectory)) {
352361
if ($item.Extension -ne ".zip") {
@@ -356,7 +365,9 @@ function Download-NuGetPackage {
356365
}
357366
Expand-Archive -Path $NuGetPkgDownloadPath -DestinationPath $NuGetPkgExtractionDirectory
358367
#Unzip-File -PathToZip $NuGetPkgDownloadPath -TargetDir $NuGetPkgExtractionDirectory
359-
Write-Host "NuGet Package is available here: $NuGetPkgExtractionDirectory"
368+
if (!$Silent) {
369+
Write-Host "NuGet Package is available here: $NuGetPkgExtractionDirectory"
370+
}
360371
}
361372
catch {
362373
Write-Warning "The Unzip-File function failed with the following error:"
@@ -415,20 +426,6 @@ function Download-NuGetPackage {
415426

416427
}
417428

418-
419-
420-
421-
422-
423-
424-
425-
426-
427-
428-
429-
430-
431-
432429
# SIG # Begin signature block
433430
# MIIMiAYJKoZIhvcNAQcCoIIMeTCCDHUCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
434431
# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR

MyFunctions/PowerShellCore_Compatible/Join-LinuxToAD.ps1

+15-10
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,14 @@ function Join-LinuxToAD {
143143
printf "$PTPasswd" | realm join $DomainName --user=$DomainUserName *> $null
144144

145145
if ($LASTEXITCODE -ne 0) {
146-
Write-Error -Message "Could not join domain $DomainName. See error output"
146+
Write-Error -Message "Could not join domain $DomainName."
147147
return
148148
}
149+
150+
# Add the Domain Admins Group to /etc/sudoers
151+
$DomainNameShort = $($DomainUserName -split "\\")[0]
152+
echo "%$DomainNameShort\\Domain\ Admins ALL=(ALL) ALL" | sudo EDITOR='tee -a' visudo
153+
149154
if ($LASTEXITCODE -eq 0) {
150155
Write-Output 'Success'
151156
}
@@ -154,8 +159,8 @@ function Join-LinuxToAD {
154159
# SIG # Begin signature block
155160
# MIIMiAYJKoZIhvcNAQcCoIIMeTCCDHUCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
156161
# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
157-
# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQU8T6Oq5o4E1NugFXyAI6yLTh3
158-
# hTigggn9MIIEJjCCAw6gAwIBAgITawAAAB/Nnq77QGja+wAAAAAAHzANBgkqhkiG
162+
# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUYG2hVmPg6yN0jB6VT8zbm5r8
163+
# 7C+gggn9MIIEJjCCAw6gAwIBAgITawAAAB/Nnq77QGja+wAAAAAAHzANBgkqhkiG
159164
# 9w0BAQsFADAwMQwwCgYDVQQGEwNMQUIxDTALBgNVBAoTBFpFUk8xETAPBgNVBAMT
160165
# CFplcm9EQzAxMB4XDTE3MDkyMDIxMDM1OFoXDTE5MDkyMDIxMTM1OFowPTETMBEG
161166
# CgmSJomT8ixkARkWA0xBQjEUMBIGCgmSJomT8ixkARkWBFpFUk8xEDAOBgNVBAMT
@@ -212,11 +217,11 @@ function Join-LinuxToAD {
212217
# ARkWA0xBQjEUMBIGCgmSJomT8ixkARkWBFpFUk8xEDAOBgNVBAMTB1plcm9TQ0EC
213218
# E1gAAAH5oOvjAv3166MAAQAAAfkwCQYFKw4DAhoFAKB4MBgGCisGAQQBgjcCAQwx
214219
# CjAIoAKAAKECgAAwGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQwHAYKKwYBBAGC
215-
# NwIBCzEOMAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFHgi9KkkqhNZwTtC
216-
# 5GashfmcM6pGMA0GCSqGSIb3DQEBAQUABIIBAEm53z9hK7SUJCXH6yHPmyc8rERg
217-
# /J528U24lpR74Wa8tHcu2NOz5XZYiAM+2RyRH0y7P1iK8dDkddLeawTGTwWBxWRW
218-
# ugo6SXqBYfGKWIA+mWFB6M2wWB1pNPysxgNkfnnAy70oJ1PUfKCeMU02XDI09LH+
219-
# 5X20zUcSSM3HZk8PzrK9DSeZrPIxhgbozmyUcEHBV04OY6O03HMi3UdH/uK8c/XU
220-
# d4i39gO4DO5VEXBLRePoF+PM0zXQ1kLi3p73Var1wKWxzTwnZ/f7u8SiJZ5IcP3a
221-
# htzsj2uKZz3uXGoDlGqb6+udERAFMgEws2Za/TFaQ3MRWz7f1hMqtjK0kCY=
220+
# NwIBCzEOMAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFBRRPMkc90D+8oco
221+
# hnBEsj/IHu/xMA0GCSqGSIb3DQEBAQUABIIBAGxMROAJuj9tdpJ+wTu4ELYI9scw
222+
# z+IBu5642o9cw7OFjOBcEkVpimKdfwWG+E6VWPz4VbrUKzeq4f7CfF9YoEB4GYZw
223+
# bTH6DACqkAcn0f8+nv2LzjMxTrVgy4r4YxJ0oX2AcF+FKn8MrBPze2PxAcSu2Qcu
224+
# lNNgZ8/CAZMqE+hQCEvjDuBBUVYmcGH5QVXiLEvHd1y7JYWjWzG+mKWsieTs4J0I
225+
# qwDRt43FYgnJe3G5FuyuIvsUsj20hDlOkWRRK7rAFRsMfO0i9+552/ftB+ZmjQTU
226+
# +ct6X7LjNf+65+G0xKYFsm9wLlYObu2Vt7uCxBQEFQsa3Tc4AhIWGoWqU5w=
222227
# SIG # End signature block

0 commit comments

Comments
 (0)