Skip to content

Commit 02eb986

Browse files
committed
Revert "Enter API key via terminal if DISPLAY is unavailable"
This reverts commit 7afd1a4.
1 parent 7afd1a4 commit 02eb986

File tree

1 file changed

+17
-21
lines changed

1 file changed

+17
-21
lines changed

R/econdata_credentials.R

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,29 @@ econdata_credentials <- function() {
44
call. = FALSE)
55
}
66
tkn <- NULL # Need to add global bindings for variables
7-
if (Sys.getenv("DISPLAY") != "") {
8-
token <- tcltk::tclVar("")
7+
token <- tcltk::tclVar("")
98

10-
tt <- tcltk::tktoplevel()
11-
tcltk::tkwm.title(tt, "econdata.co.za credentials")
12-
tkn.entry <- tcltk::tkentry(tt, textvariable = token)
9+
tt <- tcltk::tktoplevel()
10+
tcltk::tkwm.title(tt, "econdata.co.za credentials")
11+
tkn.entry <- tcltk::tkentry(tt, textvariable = token)
1312

14-
reset <- function() tcltk::tclvalue(token) <- ""
15-
reset.but <- tcltk::tkbutton(tt, text = "Reset", command = reset)
13+
reset <- function() tcltk::tclvalue(token) <- ""
14+
reset.but <- tcltk::tkbutton(tt, text = "Reset", command = reset)
1615

17-
submit <- function() {
18-
tkn <- tcltk::tclvalue(token)
19-
e <- parent.env(environment())
20-
e$tkn <- tkn
21-
tcltk::tkdestroy(tt)
22-
}
23-
submit.but <- tcltk::tkbutton(tt, text = "Submit", command = submit)
16+
submit <- function() {
17+
tkn <- tcltk::tclvalue(token)
18+
e <- parent.env(environment())
19+
e$tkn <- tkn
20+
tcltk::tkdestroy(tt)
21+
}
22+
submit.but <- tcltk::tkbutton(tt, text = "Submit", command = submit)
2423

25-
tcltk::tkgrid(tcltk::tklabel(tt, text = "Enter Token Details"),
24+
tcltk::tkgrid(tcltk::tklabel(tt, text = "Enter Token Details"),
2625
columnspan = 2)
27-
tcltk::tkgrid(tcltk::tklabel(tt, text = "API Token"),
26+
tcltk::tkgrid(tcltk::tklabel(tt, text = "API Token"),
2827
tkn.entry, pady = 10, padx = 10)
29-
tcltk::tkgrid(submit.but, reset.but, pady = 10, padx = 50)
28+
tcltk::tkgrid(submit.but, reset.but, pady = 10, padx = 50)
3029

31-
tcltk::tkwait.window(tt)
32-
} else {
33-
tkn <- readline("Enter API key: ")
34-
}
30+
tcltk::tkwait.window(tt)
3531
return(tkn)
3632
}

0 commit comments

Comments
 (0)