Skip to content

Commit 5ac0dbf

Browse files
committed
Install ps1 update after PnP changes
1 parent cd73089 commit 5ac0dbf

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Install/Install.ps1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Param(
33
[string]$Url,
44
[Parameter(Mandatory = $false, HelpMessage = "Skip search configuration")]
55
[switch]$SkipSearchConfiguration,
6+
[Parameter(Mandatory = $false, HelpMessage = "Client ID of the Entra Id application used for interactive logins. Defaults to the multi-tenant Prosjektportalen app")]
7+
[string]$ClientId = "da6c31a6-b557-4ac3-9994-7315da06ea3a",
68
[Parameter(Mandatory = $false, HelpMessage = "Do you want to perform an upgrade?")]
79
[switch]$Upgrade
810
)
@@ -25,8 +27,6 @@ function EndAction() {
2527
Write-Host "Completed in $($ElapsedSeconds)s" -ForegroundColor Green
2628
}
2729

28-
## TODO: Create install script
29-
3030
#region Setting variables based on input from user
3131
[System.Uri]$Uri = $Url.TrimEnd('/')
3232
$ManagedPath = $Uri.Segments[1]
@@ -38,10 +38,10 @@ $TemplatesBasePath = "$PSScriptRoot/Templates"
3838
Set-PnPTraceLog -Off
3939

4040
# TODO: Replace version from package.json/git-tag
41-
Write-Host "Installing Prosjektportalen veimodul version 1.0.0" -ForegroundColor Cyan
41+
Write-Host "Installing Prosjektportalen veimodul version 1.1.2" -ForegroundColor Cyan
4242

4343
#region Print installation user
44-
Connect-PnPOnline -Url $AdminSiteUrl -Interactive -ErrorAction Stop -WarningAction Ignore
44+
Connect-PnPOnline -Url $AdminSiteUrl -Interactive -ClientId $ClientId -ErrorAction Stop -WarningAction Ignore
4545
$CurrentUser = Get-PnPProperty -Property CurrentUser -ClientObject (Get-PnPContext).Web
4646
Write-Host "[INFO] Installing with user [$($CurrentUser.Email)]"
4747
#endregion
@@ -50,7 +50,7 @@ Write-Host "[INFO] Installing with user [$($CurrentUser.Email)]"
5050
if (-not $SkipSearchConfiguration.IsPresent) {
5151
StartAction("Uploading search configuration")
5252
Try {
53-
Connect-PnPOnline -Url $AdminSiteUrl -Interactive -ErrorAction Stop -WarningAction Ignore
53+
Connect-PnPOnline -Url $AdminSiteUrl -Interactive -ClientId $ClientId -ErrorAction Stop -WarningAction Ignore
5454
Set-PnPSearchConfiguration -Scope Subscription -Path "$PSScriptRoot/SearchConfiguration.xml" -ErrorAction SilentlyContinue
5555
EndAction
5656
}
@@ -64,7 +64,7 @@ if (-not $SkipSearchConfiguration.IsPresent) {
6464

6565
#region Apply Template
6666
StartAction("Applying veimodul template")
67-
Connect-PnPOnline -Url $Url -Interactive -ErrorAction Stop
67+
Connect-PnPOnline -Url $Url -Interactive -ClientId $ClientId -ErrorAction Stop
6868
Invoke-PnPSiteTemplate -Path "$($TemplatesBasePath)/veimodul.pnp" -ErrorAction Stop -WarningAction Ignore
6969
EndAction
7070
#endregion
@@ -73,7 +73,7 @@ EndAction
7373
StartAction("Configuring tillegg and standardinnhold")
7474
try {
7575

76-
Connect-PnPOnline -Url $Url -Interactive -ErrorAction Stop
76+
Connect-PnPOnline -Url $Url -Interactive -ClientId $ClientId -ErrorAction Stop
7777

7878
$ListContent = Get-PnPListItem -List Listeinnhold
7979
$Prosjekttillegg = Get-PnPListItem -List Prosjekttillegg
@@ -109,14 +109,14 @@ EndAction
109109

110110
#region Logging installation
111111
Write-Host "[INFO] Logging installation entry"
112-
Connect-PnPOnline -Url $Url -Interactive -ErrorAction Stop
112+
Connect-PnPOnline -Url $Url -Interactive -ClientId $ClientId -ErrorAction Stop
113113
$LastInstall = Get-PnPListItem -List "Installasjonslogg" -Query "<View><Query><OrderBy><FieldRef Name='Created' Ascending='False' /></OrderBy></Query></View>" | Select-Object -First 1 -Wait
114114
$PreviousVersion = "N/A"
115115
if ($null -ne $LastInstall) {
116116
$PreviousVersion = $LastInstall.FieldValues["InstallVersion"]
117117
}
118118
# TODO: Replace version from package.json/git-tag
119-
$CustomizationInfo = "Prosjektportalen veimodul 1.0.0"
119+
$CustomizationInfo = "Prosjektportalen veimodul 1.1.2"
120120
$InstallStartTime = (Get-Date -Format o)
121121
$InstallEndTime = (Get-Date -Format o)
122122

0 commit comments

Comments
 (0)