Skip to content

Commit

Permalink
Merge tag '0.13.6' into develop
Browse files Browse the repository at this point in the history
rsc 0.13.6
  • Loading branch information
HenrikBengtsson committed Jun 22, 2023
2 parents d3f9487 + e4840d8 commit efc68ef
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ISC License (ISC)

Copyright 2022 Henrik Bengtsson and Harry Putnam
Copyright 2022-2023 Henrik Bengtsson and Harry Putnam

Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.

Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Version (development version)
## Version 0.13.6 [2023-06-22]

### Miscellaneous

Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ To launch your personal RStudio Server instance, call:

```sh
$ rsc start
alice, your personal RStudio Server 2023.03.0+386 running R 4.2.3 is available on:
alice, your personal RStudio Server 2023.03.0+386 running R 4.3.1 is available on:

<http://127.0.0.1:20612>

Expand All @@ -98,7 +98,7 @@ e.g. <kbd>Ctrl-C</kbd>:
```sh
$ rsc start
alice, your personal RStudio Server 2023.03.0+386 running R 4.2.3 is available on:
alice, your personal RStudio Server 2023.03.0+386 running R 4.3.1 is available on:
<http://127.0.0.1:20612>
Expand Down Expand Up @@ -170,7 +170,7 @@ If we launch `rsc` on the remote server, we will get:
```sh
[alice@server ~]$ rsc start
alice, your personal RStudio Server 2023.03.0+386 running R 4.2.3 is available on:
alice, your personal RStudio Server 2023.03.0+386 running R 4.3.1 is available on:
<http://127.0.0.1:20612>
Expand Down Expand Up @@ -220,7 +220,7 @@ instructions:
```sh
[alice@server ~]$ rsc start
alice, your personal RStudio Server 2023.03.0+386 running R 4.2.3 is available on:
alice, your personal RStudio Server 2023.03.0+386 running R 4.3.1 is available on:
<http://127.0.0.1:20612>
Expand Down Expand Up @@ -264,7 +264,7 @@ port 20612 several times before, so we will try that this time too:
[ab@local ~]$ ssh -L 20612:server.myuniv.org:20612 alice@login.myuniv.org
[alice@login ~]$ ssh -l alice server.myuniv.org
[alice@server ~]$ rsc start --port=20612
alice, your personal RStudio Server 2023.03.0+386 running R 4.2.3 is available on:
alice, your personal RStudio Server 2023.03.0+386 running R 4.3.1 is available on:
<http://127.0.0.1:20612>
Expand Down Expand Up @@ -298,7 +298,7 @@ it launches the RStudio Server;
```sh
[ab@local ~]$ ssh -l alice server.myuniv.org
[alice@server ~]$ rsc start --revtunnel=ab@local.myuniv.org:20612
alice, your personal RStudio Server 2023.03.0+386 running R 4.2.3 is available on:
alice, your personal RStudio Server 2023.03.0+386 running R 4.3.1 is available on:
<http://127.0.0.1:20612>
Expand Down Expand Up @@ -333,22 +333,22 @@ As before, the RStudio Server is available at
```sh
$ cd /path/to/software
$ curl -L -O https://github.com/UCSF-CBI/rstudio-server-controller/archive/refs/tags/0.13.5.tar.gz
$ tar xf 0.13.5.tar.gz
$ PATH=/path/to/softwarerstudio-server-controller-0.13.5/bin:$PATH
$ curl -L -O https://github.com/UCSF-CBI/rstudio-server-controller/archive/refs/tags/0.13.6.tar.gz
$ tar xf 0.13.6.tar.gz
$ PATH=/path/to/softwarerstudio-server-controller-0.13.6/bin:$PATH
$ export PATH
$ rsc --version
0.13.5
0.13.6
```
To verify that the tool can find R and the RStudio Server executables,
call:
```sh
$ rsc --version --full
rsc: 0.13.5
rsc: 0.13.6
RStudio Server: 2023.03.0+386 (Cherry Blossom) for Linux [/path/to/rstudio-server/bin/rstudio-server]
R: 4.2.3 (2023-03-15) -- "Shortstop Beagle" [/path/to/R/bin/R]
R: 4.3.1 (2023-06-16) -- "Shortstop Beagle" [/path/to/R/bin/R]
```
Expand Down
2 changes: 1 addition & 1 deletion bin/rsc
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
### rsc config --full
### rsc log
###
### Version: 0.13.5-9001
### Version: 0.13.6
### Copyright: Henrik Bengtsson (2022-2023) and Harry Putnam (2022)
### License: ISC

Expand Down

0 comments on commit efc68ef

Please sign in to comment.