diff --git a/CBUILD_VERSION b/CBUILD_VERSION index 7e541ae..6b4d157 100644 --- a/CBUILD_VERSION +++ b/CBUILD_VERSION @@ -1 +1 @@ -2.2.2 \ No newline at end of file +2.2.3 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 665b4f3..02eb2aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.2.3 ++ removed `\r` characters from `detect_os.sh` + ## 2.2.2 + `bootstrap.sh` can show help for cbuild installations again + copy dependency out files only if they are newer or don't exist diff --git a/cbuild.sh b/cbuild.sh index 430677d..aca3151 100644 --- a/cbuild.sh +++ b/cbuild.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -INSTALLED_CBUILD_VERSION=2.2.2 +INSTALLED_CBUILD_VERSION=2.2.3 # set \t size to 4 spaces tabs 4 diff --git a/default.config b/default.config index e1aab0d..a07409b 100644 --- a/default.config +++ b/default.config @@ -1,5 +1,5 @@ #!/usr/bin/env bash -CBUILD_VERSION=2.2.2 +CBUILD_VERSION=2.2.3 PROJECT="%PROJECT_NAME%" CMP_C="gcc" diff --git a/detect_os.sh b/detect_os.sh index dea5728..2264723 100644 --- a/detect_os.sh +++ b/detect_os.sh @@ -1,46 +1,46 @@ -#!/usr/bin/env bash - -include "cbuild/myprint.sh" - -function detect_os { - local uname_result="$(uname -o)" - # myprint "uname result: '$uname_result'" - case "$uname_result" in - Msys | Cygwin | MS/Windows) - safeprint WINDOWS - ;; - Linux | GNU/Linux | Android) - safeprint LINUX - ;; - FreeBSD) - safeprint FREEBSD - ;; - Darwin) - safeprint MACOS - ;; - *) - error "unknown operating system: $uname_result" - ;; - esac -} - -function detect_arch { - local uname_result="$(uname -m)" - case "$uname_result" in - arm | arm32 | armhf | aarch32) - safeprint arm32 - ;; - arm64 | aarch64 | aarch64_be | armv8b | armv8l) - safeprint arm64 - ;; - x86 | i386 | i486 | i686) - safeprint x86 - ;; - x64 | x86_64 | amd64) - safeprint x64 - ;; - *) - error "unknown CPU architecture: $uname_result" - ;; - esac -} +!/usr/bin/env bash + +nclude "cbuild/myprint.sh" + +unction detect_os { + local uname_result="$(uname -o)" + # myprint "uname result: '$uname_result'" + case "$uname_result" in + Msys | Cygwin | MS/Windows) + safeprint WINDOWS + ;; + Linux | GNU/Linux | Android) + safeprint LINUX + ;; + FreeBSD) + safeprint FREEBSD + ;; + Darwin) + safeprint MACOS + ;; + *) + error "unknown operating system: $uname_result" + ;; + esac + + +unction detect_arch { + local uname_result="$(uname -m)" + case "$uname_result" in + arm | arm32 | armhf | aarch32) + safeprint arm32 + ;; + arm64 | aarch64 | aarch64_be | armv8b | armv8l) + safeprint arm64 + ;; + x86 | i386 | i486 | i686) + safeprint x86 + ;; + x64 | x86_64 | amd64) + safeprint x64 + ;; + *) + error "unknown CPU architecture: $uname_result" + ;; + esac +