Skip to content

fix newlines with wsh getvar. #1349

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
sawka merged 1 commit into from
Nov 26, 2024
Merged

fix newlines with wsh getvar. #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 20 additions & 1 deletion cmd/wsh/cmd/wshcmd-getvar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ var (
getVarAllVars bool
getVarNullTerminate bool
getVarLocal bool
getVarFlagNL bool
getVarFlagNoNL bool
)

func init() {
Expand All @@ -38,6 +40,19 @@ func init() {
getVarCmd.Flags().BoolVar(&getVarAllVars, "all", false, "get all variables")
getVarCmd.Flags().BoolVarP(&getVarNullTerminate, "null", "0", false, "use null terminators in output")
getVarCmd.Flags().BoolVarP(&getVarLocal, "local", "l", false, "get variables local to block")
getVarCmd.Flags().BoolVarP(&getVarFlagNL, "newline", "n", false, "print newline after output")
getVarCmd.Flags().BoolVarP(&getVarFlagNoNL, "no-newline", "N", false, "do not print newline after output")
}

func shouldPrintNewline() bool {
isTty := getIsTty()
if getVarFlagNL {
return true
}
if getVarFlagNoNL {
return false
}
return isTty
}

func getVarRun(cmd *cobra.Command, args []string) error {
Expand Down Expand Up @@ -87,7 +102,11 @@ func getVarRun(cmd *cobra.Command, args []string) error {
return nil
}

WriteStdout("%s\n", resp.Val)
WriteStdout("%s", resp.Val)
if shouldPrintNewline() {
WriteStdout("\n")
}

return nil
}

Expand Down
7 changes: 7 additions & 0 deletions cmd/wsh/cmd/wshcmd-root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ func preRunSetupRpcClient(cmd *cobra.Command, args []string) error {
return nil
}

func getIsTty() bool {
if fileInfo, _ := os.Stdout.Stat(); (fileInfo.Mode() & os.ModeCharDevice) != 0 {
return true
}
return false
}

type RunEFnType = func(*cobra.Command, []string) error

func activityWrap(activityStr string, origRunE RunEFnType) RunEFnType {
Expand Down