Skip to content

Remove Rscript version checks #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yxsee wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove Rscript version checks #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3b5f1a
Update scafe.tool.cm.annotate
yxsee Mar 19, 2024
33fd824
Update scafe.tool.cm.filter
yxsee Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions scripts/scafe.tool.cm.annotate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,12 +689,12 @@ sub checkRScriptVersion {
my $dirPath = dirname(rel2abs($0));
my $optimize_tangent_R = "$dirPath/../resources/R/optimize_tangent.R";

my $stdOut = `$Rscript_bin --version 2>&1`;
if ($stdOut =~ m/R scripting front-end version (\S+)/) {
&reportAndLogStatus("Checking: Rscript version: $1", 0, "\n");#->2953
} else {
die "Rscript is not installed properly at $Rscript_bin. Quitting.\n";
}
#my $stdOut = `$Rscript_bin --version 2>&1`;
#if ($stdOut =~ m/R scripting front-end version (\S+)/) {
# &reportAndLogStatus("Checking: Rscript version: $1", 0, "\n");#->2953
#} else {
# die "Rscript is not installed properly at $Rscript_bin. Quitting.\n";
#}

if (-s $optimize_tangent_R) {
&reportAndLogStatus("optimize_tangent_R found.", 0, "\n");#->2953
Expand Down
12 changes: 6 additions & 6 deletions scripts/scafe.tool.cm.filter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,12 +712,12 @@ sub checkRScriptVersion {
my $predict_prob_R = "$dirPath/../resources/R/predict_prob.R";
my $benchmark_roc_R = "$dirPath/../resources/R/benchmark_roc.R";

my $stdOut = `$Rscript_bin --version 2>&1`;
if ($stdOut =~ m/R scripting front-end version (\S+)/) {
&reportAndLogStatus("Checking: Rscript version: $1", 0, "\n");#->2284
} else {
die "Rscript is not installed properly. Quitting.\n";
}
#my $stdOut = `$Rscript_bin --version 2>&1`;
#if ($stdOut =~ m/R scripting front-end version (\S+)/) {
# &reportAndLogStatus("Checking: Rscript version: $1", 0, "\n");#->2284
#} else {
# die "Rscript is not installed properly. Quitting.\n";
#}

if (-s $build_glm_R) {
&reportAndLogStatus("build_glm_R found.", 0, "\n");#->2284
Expand Down