Skip to content

fix linux issue #20613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isra-fel merged 2 commits into from
Jan 13, 2023
Merged

fix linux issue #20613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f20fee
join differently for Linux shell script header
Jan 3, 2023
811a553
fix linux issue by detecting comments and escaping them and then new …
Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 44 additions & 1 deletion src/Compute/Compute.Autorest/custom/Set-AzVMRunCommand_ScriptLocalPath.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,50 @@ function Set-AzVMRunCommand_ScriptLocalPath {
if ($PSBoundParameters.ContainsKey("ScriptLocalPath"))
{
# Read Local File and add
$script = (Get-Content -Path $ScriptLocalPath) -join ";"
$script = ""
if ((Get-ChildItem $scriptLocalPath | Select-Object Extension).Extension -eq ".sh"){
foreach ($line in Get-Content -Path $scriptLocalPath){
$words = $line.trim().split()
$commentFound = $false
foreach ($word in $words){
if ($word[0] -eq "#" -and $commentFound -eq $false){
$commentFound = $true
$script += "``" + $word + " "
}
else{
$script += $word + " "
}
}
$script = $script.trim()
#close
if ($commentFound){
$script += "``"
}
$script += ";"
}
}
else{
foreach ($line in Get-Content -Path $scriptLocalPath){
$words = $line.trim().split()
$commentFound = $false
foreach ($word in $words){
if ($word[0] -eq "#" -and $commentFound -eq $false){
$commentFound = $true
$script += "<" + $word + " "
}
else{
$script += $word + " "
}
}
$script = $script.trim()
#close
if ($commentFound){
$script += "#>"
}
$script += ";"
}
}

$PSBoundParameters.Add("SourceScript", $script)
# If necessary, remove the -ParameterA parameter from the dictionary of bound parameters
$null = $PSBoundParameters.Remove("ScriptLocalPath")
Expand Down
46 changes: 44 additions & 2 deletions src/Compute/Compute.Autorest/custom/Set-AzVmssVMRunCommand_ScriptLocalPath.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,50 @@ function Set-AzVmssVMRunCommand_ScriptLocalPath {
process {
if ($PSBoundParameters.ContainsKey("ScriptLocalPath"))
{
# Read Local File and add
$script = (Get-Content -Path $ScriptLocalPath) -join ";"
# Read Local File and add
$script = ""
if ((Get-ChildItem $scriptLocalPath | Select-Object Extension).Extension -eq ".sh"){
foreach ($line in Get-Content -Path $scriptLocalPath){
$words = $line.trim().split()
$commentFound = $false
foreach ($word in $words){
if ($word[0] -eq "#" -and $commentFound -eq $false){
$commentFound = $true
$script += "``" + $word + " "
}
else{
$script += $word + " "
}
}
$script = $script.trim()
#close
if ($commentFound){
$script += "``"
}
$script += ";"
}
}
else{
foreach ($line in Get-Content -Path $scriptLocalPath){
$words = $line.trim().split()
$commentFound = $false
foreach ($word in $words){
if ($word[0] -eq "#" -and $commentFound -eq $false){
$commentFound = $true
$script += "<" + $word + " "
}
else{
$script += $word + " "
}
}
$script = $script.trim()
#close
if ($commentFound){
$script += "#>"
}
$script += ";"
}
}
$PSBoundParameters.Add("SourceScript", $script)
# If necessary, remove the -ParameterA parameter from the dictionary of bound parameters
$null = $PSBoundParameters.Remove("ScriptLocalPath")
Expand Down