pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #83 from petejohanson/core/setup-script-macos-read-i-fixes

Browse source 
macOS compatability fixes for setup.sh
This commit is contained in:
Pete Johanson 2020-08-11 09:50:36 -04:00 committed by GitHub
commit cac850628c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
docs/static/setup.sh vendored
View file

@ -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 read -e -p "GitHub Username (leave empty to skip GitHub repo creation): " github_user
if [ -n "$github_user" ]; then 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 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 if [ -z "$github_repo" ]; then github_repo="https://github.com/${github_user}/${repo_name}.git"; fi
else else
@ -90,7 +90,7 @@ fi
echo "" echo ""
read -p "Continue? [Yn]: " do_it 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..." echo "Aborting..."
exit exit
fi fi
@ -108,7 +108,7 @@ fi
popd popd
sed -i \ sed -i'.orig' \
-e "s/BOARD_NAME/$board/" \ -e "s/BOARD_NAME/$board/" \
-e "s/SHIELD_NAME/$shield/" \ -e "s/SHIELD_NAME/$shield/" \
-e "s/KEYBOARD_TITLE/$shield_title/" \ -e "s/KEYBOARD_TITLE/$shield_title/" \
@ -116,9 +116,11 @@ sed -i \
if [ "$board" == "proton_c" ]; then if [ "$board" == "proton_c" ]; then
# Proton-C board still fa # 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 fi
rm .github/workflows/*.yml.orig
rm -rf .git rm -rf .git
git init . git init .
git add . git add .