Skip to content

Commit

Permalink
more typos
Browse files Browse the repository at this point in the history
  • Loading branch information
gisma committed May 31, 2024
1 parent 8c6e5de commit a2c6201
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 22 deletions.
4 changes: 2 additions & 2 deletions R/grassControl.R
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#'
#' run = FALSE
#' if (run) {
#' # automatic retrieval of the GRASS7 enviroment settings
#' # automatic retrieval of the GRASS environment settings
#' paramGRASSx()
#'
#'
Expand Down Expand Up @@ -96,7 +96,7 @@ paramGRASSx <- function(set_default_GRASS=NULL,
#'@details The concept is very straightforward but for an all days usage pretty
#' helpful. You need to provide a \code{terra} or a \code{sf} object. The derived properties are used to initialize a temporary but static
#' \href{https://CRAN.R-project.org/package=rgrass}{rgrass} environment. During the rsession you will have full access to
#' GRASS7 both via the wrapper package as well as the command line. paramGRASSw initializes the usage of GRASS.
#' GRASS both via the wrapper package as well as the command line. paramGRASSw initializes the usage of GRASS.
#'@param DL character search location default = \code{C:}
#'@param ver_select boolean default is FALSE. If there is more than one 'SAGA GIS' installation and \code{ver_select} = TRUE the user can select interactively the preferred 'SAGA GIS' version
#'@param set_default_GRASS default = NULL forces a full search for 'GRASS GIS' binaries. You may
Expand Down
2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ articles:
link2GI5: link2GI5.html
link2GI6: link2GI6.html
link2GI7: link2GI7.html
last_built: 2024-05-31T20:21Z
last_built: 2024-05-31T20:27Z
urls:
reference: https://r-spatial.github.io/link2GI/reference
article: https://r-spatial.github.io/link2GI/articles
Expand Down
2 changes: 1 addition & 1 deletion man/paramGRASSw.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/paramGRASSx.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions vignettes/link2GI7.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,17 @@ However, this is tedious and QGIS2 only supports the SAGA LTS version.

## GRASS

You can install GRASS6 and GRASS7 via `homebrew`:
You can install GRASS6/7/8 via `homebrew`:

```sh
# brew tap osgeo4mac
brew install grass6 grass7
brew install grass6 grass7 grass8
```

The binary GRASS installation can be found [here](https://grass.osgeo.org/download/mac/).
However, we recommend to use the `homebrew` approach.

When installing GRASS7 independently of QGIS via `homebrew`, please make sure to install it **before** you have installed QGIS.
Only this way, the path for the QGIS processing plugin will be updated.
Otherwise, the GRASS installation will work, however, `GRASS7Utils.grassPath()`, a QGIS function that links to the GRASS installation, gives back a non-existing path such as `/Applications/Grass-7.0.app/Contents/MacOS` which in turn prevents GRASS algorithms from working from within QGIS.
When installing GRASS independently of QGIS via `homebrew`, please make sure to install it **before** you have installed QGIS.

## QGIS

Expand Down
10 changes: 4 additions & 6 deletions vignettes/link2GI7.html
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<div class="frontmatter">
<div class="title"><h1>Installation guide for link2GI related Software</h1></div>
<div class="author"><h2>Chris Reudenbach</h2></div>
<div class="date"><h3>2024-05-10</h3></div>
<div class="date"><h3>2024-05-31</h3></div>
</div>
<div class="body">
<h1 id="vignette-info">Vignette Info</h1>
Expand Down Expand Up @@ -252,15 +252,13 @@ <h2 id="saga">SAGA</h2>
<p>Alternatively, you can compile SAGA from source from the <a href="https://sourceforge.net/projects/saga-gis/files/">SAGA website</a>.
However, this is tedious and QGIS2 only supports the SAGA LTS version.</p>
<h2 id="grass">GRASS</h2>
<p>You can install GRASS6 and GRASS7 via <code>homebrew</code>:</p>
<p>You can install GRASS6/7/8 via <code>homebrew</code>:</p>
<pre><code class="language-sh"># brew tap osgeo4mac
brew install grass6 grass7
brew install grass6 grass7 grass8
</code></pre>
<p>The binary GRASS installation can be found <a href="https://grass.osgeo.org/download/mac/">here</a>.
However, we recommend to use the <code>homebrew</code> approach.</p>
<p>When installing GRASS7 independently of QGIS via <code>homebrew</code>, please make sure to install it <strong>before</strong> you have installed QGIS.
Only this way, the path for the QGIS processing plugin will be updated.
Otherwise, the GRASS installation will work, however, <code>GRASS7Utils.grassPath()</code>, a QGIS function that links to the GRASS installation, gives back a non-existing path such as <code>/Applications/Grass-7.0.app/Contents/MacOS</code> which in turn prevents GRASS algorithms from working from within QGIS.</p>
<p>When installing GRASS independently of QGIS via <code>homebrew</code>, please make sure to install it <strong>before</strong> you have installed QGIS.</p>
<h2 id="qgis">QGIS</h2>
<p>Two options exist installing QGIS on macOS</p>
<ol>
Expand Down
10 changes: 4 additions & 6 deletions vignettes/link2GI7.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
author: "Chris Reudenbach"
title: "Installation guide for link2GI related Software"
date: "2024-05-10"
date: "2024-05-31"
editor_options:
chunk_output_type: console
output:
Expand Down Expand Up @@ -184,19 +184,17 @@ However, this is tedious and QGIS2 only supports the SAGA LTS version.

## GRASS

You can install GRASS6 and GRASS7 via `homebrew`:
You can install GRASS6/7/8 via `homebrew`:

```sh
# brew tap osgeo4mac
brew install grass6 grass7
brew install grass6 grass7 grass8
```

The binary GRASS installation can be found [here](https://grass.osgeo.org/download/mac/).
However, we recommend to use the `homebrew` approach.

When installing GRASS7 independently of QGIS via `homebrew`, please make sure to install it **before** you have installed QGIS.
Only this way, the path for the QGIS processing plugin will be updated.
Otherwise, the GRASS installation will work, however, `GRASS7Utils.grassPath()`, a QGIS function that links to the GRASS installation, gives back a non-existing path such as `/Applications/Grass-7.0.app/Contents/MacOS` which in turn prevents GRASS algorithms from working from within QGIS.
When installing GRASS independently of QGIS via `homebrew`, please make sure to install it **before** you have installed QGIS.

## QGIS

Expand Down

0 comments on commit a2c6201

Please sign in to comment.