Timerix/cbuild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

removed \r characters from detect_os.sh

Browse Source
This commit is contained in:
Timerix 2025-06-20 19:11:08 +05:00
parent 596c570756
commit cae29d6395
5 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CBUILD_VERSION
View File

@ -1 +1 @@
2.2.2 2.2.3

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## 2.2.3
+ removed `\r` characters from `detect_os.sh`
## 2.2.2 ## 2.2.2
+ `bootstrap.sh` can show help for cbuild installations again + `bootstrap.sh` can show help for cbuild installations again
+ copy dependency out files only if they are newer or don't exist + copy dependency out files only if they are newer or don't exist

2
cbuild.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
INSTALLED_CBUILD_VERSION=2.2.2 INSTALLED_CBUILD_VERSION=2.2.3
# set \t size to 4 spaces # set \t size to 4 spaces
tabs 4 tabs 4

2
default.config
View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
CBUILD_VERSION=2.2.2 CBUILD_VERSION=2.2.3
PROJECT="%PROJECT_NAME%" PROJECT="%PROJECT_NAME%"
CMP_C="gcc" CMP_C="gcc"

12
detect_os.sh
View File

@ -1,8 +1,8 @@
#!/usr/bin/env bash !/usr/bin/env bash
include "cbuild/myprint.sh" nclude "cbuild/myprint.sh"
function detect_os { unction detect_os {
local uname_result="$(uname -o)" local uname_result="$(uname -o)"
# myprint "uname result: '$uname_result'" # myprint "uname result: '$uname_result'"
case "$uname_result" in case "$uname_result" in
@ -22,9 +22,9 @@ function detect_os {
error "unknown operating system: $uname_result" error "unknown operating system: $uname_result"
;; ;;
esac esac
}
function detect_arch {
unction detect_arch {
local uname_result="$(uname -m)" local uname_result="$(uname -m)"
case "$uname_result" in case "$uname_result" in
arm | arm32 | armhf | aarch32) arm | arm32 | armhf | aarch32)
@ -43,4 +43,4 @@ function detect_arch {
error "unknown CPU architecture: $uname_result" error "unknown CPU architecture: $uname_result"
;; ;;
esac esac
}