From d0e9294897600c2243e54eaedb5e09fb4626f114 Mon Sep 17 00:00:00 2001 From: jsconan Date: Thu, 17 Feb 2022 15:52:40 +0100 Subject: [PATCH 1/4] fix: use the path to slic3r when provided to get the version --- scripts/utils/slic3r.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/utils/slic3r.sh b/scripts/utils/slic3r.sh index 09a6eeb..f190728 100644 --- a/scripts/utils/slic3r.sh +++ b/scripts/utils/slic3r.sh @@ -109,7 +109,7 @@ slic3rversion() { if [ "$1" != "" ]; then cmd="$1" fi - version="$(${slic3rcmd} --help | egrep -o '[0-9].[0-9]' | head -1 2>&1)" + version="$(${cmd} --help | egrep -o '[0-9].[0-9]' | head -1 2>&1)" if [ "$?" != "0" ]; then return ${E_SLIC3R} fi From abdc9e1c3a15b223e892db28ae5e07fbc3f40aff Mon Sep 17 00:00:00 2001 From: jsconan Date: Thu, 17 Feb 2022 15:53:15 +0100 Subject: [PATCH 2/4] fix: use the function slic3rversion to get the version of slic3r --- scripts/utils/slic3r.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/utils/slic3r.sh b/scripts/utils/slic3r.sh index f190728..8e84063 100644 --- a/scripts/utils/slic3r.sh +++ b/scripts/utils/slic3r.sh @@ -142,7 +142,7 @@ slic3rcheck() { else printmessage "${C_SPE}${slic3rname}${C_RST} has been detected." fi - local version="$(${slic3rcmd} --help | egrep -o '[0-9].[0-9]' | head -1 2>&1)" + local version="$(slic3rversion)" if [[ "${version}" < "${slic3rver}" ]]; then printerror "The installed version of ${slic3rname} does not meet the requirement.\n\tInstalled: ${version}\n\tRequired: ${slic3rver}" ${E_SLIC3R} fi From d043307936132856ac732e9eac9100cdf3f27663 Mon Sep 17 00:00:00 2001 From: jsconan Date: Thu, 17 Feb 2022 16:13:05 +0100 Subject: [PATCH 3/4] chore: bump version --- core/version.scad | 2 +- test/core/version.scad | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/version.scad b/core/version.scad index b18fb89..d66a5a2 100644 --- a/core/version.scad +++ b/core/version.scad @@ -36,7 +36,7 @@ * The version of the library. * @type Vector */ -CAMEL_SCAD_VERSION = [1, 6, 0]; +CAMEL_SCAD_VERSION = [1, 6, 1]; /** * The minimal version of OpenSCAD required by the library. diff --git a/test/core/version.scad b/test/core/version.scad index 7960733..78c8cd8 100644 --- a/test/core/version.scad +++ b/test/core/version.scad @@ -45,10 +45,10 @@ module testCoreVersion() { // test camelSCAD() testModule("camelSCAD()", 2) { testUnit("as vector", 1) { - assertEqual(camelSCAD(), [1, 6, 0], "The current version of the library is 1.6.0"); + assertEqual(camelSCAD(), [1, 6, 1], "The current version of the library is 1.6.1"); } testUnit("as string", 1) { - assertEqual(camelSCAD(true), "1.6.0", "The current version of the library is 1.6.0"); + assertEqual(camelSCAD(true), "1.6.1", "The current version of the library is 1.6.1"); } } } From ae830d21de8037663592252e2b0572f46a0c48ec Mon Sep 17 00:00:00 2001 From: jsconan Date: Thu, 17 Feb 2022 16:13:45 +0100 Subject: [PATCH 4/4] chore: update history file with version 1.6.1 --- HISTORY.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index c34a831..aabc69a 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,12 @@ # camelSCAD history +## [Version 1.6.1](https://github.com/jsconan/camelSCAD/releases/tag/v1.6.1) + +Fix script utils: + +- use the provided path to Slic3r to get the version in `slic3rversion` +- use the function `slic3rversion` to get the version of Slic3r + ## [Version 1.6.0](https://github.com/jsconan/camelSCAD/releases/tag/v1.6.0) Add core functions: