abdul124
/
rust-core_io
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17 from parasyte/fix/macos 

Fix shell script compatibility with macOS
This commit is contained in:
jethrogb 2019-04-30 18:57:15 -07:00 committed by GitHub
parent 4bab33bd4c de8b72efde
commit 8e09f8c5da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-src.sh
View File

@ -4,7 +4,7 @@
# commit-db.rb list-valid nightly|GIT_DIR=/your/rust/dir/.git ./build-src.sh # commit-db.rb list-valid nightly|GIT_DIR=/your/rust/dir/.git ./build-src.sh
if [ $(uname) == 'Darwin' ]; then if [ $(uname) == 'Darwin' ]; then
alias tac='tail -f' alias tac='tail -r'
fi fi
prompt_changes() { prompt_changes() {

6
edit-patches.sh
View File

@ -5,7 +5,7 @@
prompt_changes() { prompt_changes() {
bold_arrow; echo "Editing $IO_COMMIT" bold_arrow; echo "Editing $IO_COMMIT"
bold_arrow; echo -e "Remember to test your changes with: \e[1;36mcargo build\e[0m" bold_arrow; echo -e "Remember to test your changes with: \033[1;36mcargo build\033[0m"
local MAIN_GIT_DIR="$GIT_DIR" local MAIN_GIT_DIR="$GIT_DIR"
local GIT_DIR=./.git CORE_IO_COMMIT=$IO_COMMIT local GIT_DIR=./.git CORE_IO_COMMIT=$IO_COMMIT
@ -18,9 +18,9 @@ prompt_changes() {
patch -s -p1 < $PATCH_DIR/$IO_COMMIT.patch patch -s -p1 < $PATCH_DIR/$IO_COMMIT.patch
git commit -a -m "existing patch for $IO_COMMIT" > /dev/null git commit -a -m "existing patch for $IO_COMMIT" > /dev/null
bold_arrow; echo -e "Applying patch from \e[1;36m$TMP_PATCH\e[0m" bold_arrow; echo -e "Applying patch from \033[1;36m$TMP_PATCH\033[0m"
patch -p1 < $TMP_PATCH || true patch -p1 < $TMP_PATCH || true
bold_arrow; echo -e "Make your changes now (\e[1;36mctrl-D\e[0m when finished)" bold_arrow; echo -e "Make your changes now (\033[1;36mctrl-D\033[0m when finished)"
bash_diff_loop "No changes were made" bash_diff_loop "No changes were made"
bold_arrow; echo "Replacing $IO_COMMIT.patch with updated version" bold_arrow; echo "Replacing $IO_COMMIT.patch with updated version"
git diff > $TMP_PATCH git diff > $TMP_PATCH

2
functions.sh
View File

@ -35,7 +35,7 @@ get_io_commits() {
} }
get_patch_commits() { get_patch_commits() {
find $PATCH_DIR -type f|xargs -n 1 basename|cut -d. -f1 find $PATCH_DIR -type f -print0|xargs -0 -n 1 basename|cut -d. -f1
} }
prepare_version() { prepare_version() {