Skip to content

Commit 2fd484f

Browse files
daxian-dbwadityapatwardhan
authored andcommitted
Update the man help file used in packaging (PowerShell#5173)
* Update pacakging.psm1 and rename man file * Update pwsh.1.ronn
1 parent e908b8a commit 2fd484f

3 files changed

Lines changed: 6 additions & 13 deletions

File tree

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY
5151
# default location for produced nuget packages
5252
/nuget-artifacts
5353

54-
# generated man files
55-
/assets/powershell.1*
56-
5754
# resgen output
5855
gen
5956

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
powershell(1) -- command-line shell and .NET REPL
1+
pwsh(1) -- PowerShell command-line shell and .NET REPL
22
=================================================
33

44
## SYNOPSIS
55

6-
`powershell` [`-NoLogo`] [`-NoExit`] [`-NoProfile`] [`-NonInteractive`]
6+
`pwsh` [`-NoLogo`] [`-NoExit`] [`-NoProfile`] [`-NonInteractive`]
77
[`-InputFormat` {Text | XML}] [`-OutputFormat` {Text | XML}]
88
[`-EncodedCommand` <Base64EncodedCommand>]
99
[`-File` <filePath> <args>] [`-ExecutionPolicy` <ExecutionPolicy>]
@@ -120,4 +120,4 @@ These are automatically defined PowerShell-language variables.
120120
## COPYRIGHT
121121

122122
Copyright (c) 2016 Microsoft Corporation.
123-
All rights reserved.
123+
All rights reserved.

tools/packaging/packaging.psm1

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -493,20 +493,16 @@ function New-UnixPackage {
493493
}
494494

495495
# run ronn to convert man page to roff
496-
$RonnFile = Join-Path $PSScriptRoot "/../../assets/powershell.1.ronn"
496+
$RonnFile = Join-Path $PSScriptRoot "/../../assets/pwsh.1.ronn"
497497
$RoffFile = $RonnFile -replace "\.ronn$"
498498

499499
# Run ronn on assets file
500500
# Run does not play well with files named powershell6.0.1, so we generate and then rename
501501
Start-NativeExecution { ronn --roff $RonnFile }
502502

503-
# Setup for side-by-side man pages (noop if primary package)
504-
$FixedRoffFile = $RoffFile -replace "powershell.1$", "pwsh.1"
505-
Move-Item $RoffFile $FixedRoffFile
506-
507503
# gzip in assets directory
508-
$GzipFile = "$FixedRoffFile.gz"
509-
Start-NativeExecution { gzip -f $FixedRoffFile }
504+
$GzipFile = "$RoffFile.gz"
505+
Start-NativeExecution { gzip -f $RoffFile }
510506

511507
$ManFile = Join-Path "/usr/local/share/man/man1" (Split-Path -Leaf $GzipFile)
512508

0 commit comments

Comments
 (0)