From e34f649c02ebdbef521dda0e54ef765ba8f17223 Mon Sep 17 00:00:00 2001 From: Nuno Cruces Date: Thu, 5 May 2022 13:03:53 +0100 Subject: [PATCH] Use json to quote strings. --- internal/zenutil/osa_generated.go | 10 +++++----- internal/zenutil/osascripts/dialog.gojs | 12 +++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/internal/zenutil/osa_generated.go b/internal/zenutil/osa_generated.go index 92b286f..a6f6f8e 100644 --- a/internal/zenutil/osa_generated.go +++ b/internal/zenutil/osa_generated.go @@ -55,13 +55,13 @@ fmt.stringFromDate(date.dateValue) var app=Application.currentApplication() app.includeStandardAdditions=true app.activate() -ObjC.import("stdlib") -ObjC.import("stdio") -var opt={{json .Options}} +ObjC.import('stdio') +ObjC.import('stdlib') +var opts={{json .Options}} {{- if .IconPath}} -opt["withIcon"]=Path("{{.IconPath}}") +opts.withIcon=Path({{json .IconPath}}) {{- end}} -var res=app.{{.Operation}}({{json .Text}},opt) +var res=app.{{.Operation}}({{json .Text}},opts) if(res.gaveUp){$.exit(5)} if(res.buttonReturned==={{json .Extra}}){$.puts(res.buttonReturned) $.exit(1)} diff --git a/internal/zenutil/osascripts/dialog.gojs b/internal/zenutil/osascripts/dialog.gojs index 9189883..b6f8f42 100644 --- a/internal/zenutil/osascripts/dialog.gojs +++ b/internal/zenutil/osascripts/dialog.gojs @@ -2,13 +2,15 @@ var app = Application.currentApplication() app.includeStandardAdditions = true app.activate() -ObjC.import("stdlib") -ObjC.import("stdio") -var opt = {{json .Options}} +ObjC.import('stdio') +ObjC.import('stdlib') + +var opts = {{json .Options}} {{- if .IconPath}} -opt["withIcon"] = Path("{{.IconPath}}") + opts.withIcon = Path({{json .IconPath}}) {{- end}} -var res = app.{{.Operation}}({{json .Text}}, opt) + +var res = app.{{.Operation}}({{json .Text}}, opts) if (res.gaveUp) { $.exit(5) }