Skip to content

Commit 944df15

Browse files
committed
build: ensure proper capitalization of R and RScript
These scripts previously worked on macOS, but not on Linux. This was due to Apple's case-insensitive file system. This commit ensures that the executables are properly capitalized. The commit also removes unused usage information functions as shellcheck was complaining about them.
1 parent 4fc0e7b commit 944df15

File tree

3 files changed

+5
-32
lines changed

3 files changed

+5
-32
lines changed

tools/scripts/check_lintr

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,9 @@
2424
# VARIABLES #
2525

2626
# Find Rscript:
27-
RSCRIPT=$(command -v rscript 2>/dev/null)
27+
RSCRIPT=$(command -v Rscript 2>/dev/null)
2828

2929

30-
# FUNCTIONS #
31-
32-
# Prints usage information.
33-
usage() {
34-
echo '' >&2
35-
echo 'Usage: check_lintr' >&2
36-
echo '' >&2
37-
}
38-
3930
# MAIN #
4031

4132
if [[ -x "${RSCRIPT}" ]] && "${RSCRIPT}" -e 'packageVersion("lintr")' &>/dev/null; then

tools/scripts/check_rscript

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,9 @@
2424
# VARIABLES #
2525

2626
# Find Rscript:
27-
RSCRIPT=$(command -v rscript 2>/dev/null)
27+
RSCRIPT=$(command -v Rscript 2>/dev/null)
2828

2929

30-
# FUNCTIONS #
31-
32-
# Prints usage information.
33-
usage() {
34-
echo '' >&2
35-
echo 'Usage: check_rscript' >&2
36-
echo '' >&2
37-
}
38-
3930
# MAIN #
4031

4132
if [[ -x "${RSCRIPT}" ]] && "${RSCRIPT}" --version >/dev/null; then

tools/scripts/deps_info

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,6 @@
2121
# Usage: deps_info
2222
#
2323

24-
# FUNCTIONS #
25-
26-
# Prints usage information.
27-
usage() {
28-
echo '' >&2
29-
echo 'Usage: deps_info' >&2
30-
echo '' >&2
31-
}
32-
3324
# MAIN #
3425

3526
CLANG=$(command -v clang 2>/dev/null)
@@ -142,7 +133,7 @@ else
142133
fi
143134
echo '' >&2
144135

145-
RSCRIPT=$(command -v rscript 2>/dev/null)
136+
RSCRIPT=$(command -v Rscript 2>/dev/null)
146137
echo '-----'
147138
echo 'lintr:' >&2
148139
echo '' >&2
@@ -252,7 +243,7 @@ else
252243
fi
253244
echo '' >&2
254245

255-
R=$(command -v r 2>/dev/null)
246+
R=$(command -v R 2>/dev/null)
256247
echo '-----'
257248
echo 'R:' >&2
258249
echo '' >&2
@@ -263,7 +254,7 @@ else
263254
fi
264255
echo '' >&2
265256

266-
RSCRIPT=$(command -v rscript 2>/dev/null)
257+
RSCRIPT=$(command -v Rscript 2>/dev/null)
267258
echo '-----'
268259
echo 'Rscript:' >&2
269260
echo '' >&2

0 commit comments

Comments
 (0)