diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-08-11 09:50:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 09:50:36 -0400 |
| commit | cac850628cad444fc825d0c94a9044ad96a68bdf (patch) | |
| tree | 1d1fd4587561fee34b2204f3e9f460177f6b98e3 /docs | |
| parent | bc6b11eb02352900a62434ab60415f972222a1a2 (diff) | |
| parent | 47dbba21849a136797014f4691c999de28073bf3 (diff) | |
Merge pull request #83 from petejohanson/core/setup-script-macos-read-i-fixes
macOS compatability fixes for setup.sh
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/static/setup.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/static/setup.sh b/docs/static/setup.sh index 4208943..27dcb0b 100644 --- a/docs/static/setup.sh +++ b/docs/static/setup.sh @@ -64,10 +64,10 @@ if [ -z "$copy_keymap" ] || [ "$copy_keymap" == "Y" ] || [ "$copy_keymap" == "y" read -e -p "GitHub Username (leave empty to skip GitHub repo creation): " github_user if [ -n "$github_user" ]; then - read -e -i "zmk-config" -p "GitHub Repo Name: " repo_name + read -p "GitHub Repo Name [zmk-config]: " repo_name if [ -z "$repo_name" ]; then repo_name="zmk-config"; fi - read -e -i "https://github.com/${github_user}/${repo_name}.git" -p "GitHub Repo: " github_repo + read -p "GitHub Repo [https://github.com/${github_user}/${repo_name}.git]: " github_repo if [ -z "$github_repo" ]; then github_repo="https://github.com/${github_user}/${repo_name}.git"; fi else @@ -90,7 +90,7 @@ fi echo "" read -p "Continue? [Yn]: " do_it -if [ -n "$do_it" ] && [ "$do_it" != "y" ]; then +if [ -n "$do_it" ] && [ "$do_it" != "y" ] && [ "$do_it" != "Y" ]; then echo "Aborting..." exit fi @@ -108,7 +108,7 @@ fi popd -sed -i \ +sed -i'.orig' \ -e "s/BOARD_NAME/$board/" \ -e "s/SHIELD_NAME/$shield/" \ -e "s/KEYBOARD_TITLE/$shield_title/" \ @@ -116,9 +116,11 @@ sed -i \ if [ "$board" == "proton_c" ]; then # Proton-C board still fa - sed -i -e "s/uf2/hex/g" .github/workflows/build.yml + sed -i'.orig' -e "s/uf2/hex/g" .github/workflows/build.yml fi +rm .github/workflows/*.yml.orig + rm -rf .git git init . git add . |