From 595dff68710f7f58e7e257c3d060e80e413dfb87 Mon Sep 17 00:00:00 2001
From: CrossR <r.cross@lancaster.ac.uk>
Date: Sun, 13 Sep 2020 18:07:45 +0100
Subject: Add PowerShell script and tidy up bash script.

---
 docs/static/setup.ps1 | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++
 docs/static/setup.sh  |  64 ++++++++++--------
 2 files changed, 213 insertions(+), 27 deletions(-)
 create mode 100644 docs/static/setup.ps1

(limited to 'docs/static')

diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1
new file mode 100644
index 0000000..acda194
--- /dev/null
+++ b/docs/static/setup.ps1
@@ -0,0 +1,176 @@
+$ErrorActionPreference = "Stop"
+
+function Get-Choice-From-Options {
+    param(
+        [String[]] $Options,
+        [String] $Prompt
+    )
+
+    while ($true) {
+        for ($i = 0; $i -lt $Options.length; $i++) {
+            Write-Host "$($i + 1)) $($Options[$i])"
+        }
+        
+        Write-Host "$($Options.length + 1)) Quit"
+        $selection = Read-Host $Prompt
+
+        if ($selection -eq $Options.length + 1) {
+            Write-Host "Goodbye!"
+            exit
+        }
+        elseif ($selection -le $Options.length) {
+            $choice = $($selection - 1)
+            break
+        }
+        else {
+            Write-Host "Invalid Option. Try another one."
+        }
+    }
+
+    return $choice
+}
+
+function Test-Git-Config {
+    param(
+        [String] $Option,
+        [String] $ErrMsg
+    )
+
+    git config $Option | Out-Null
+
+    if ($lastExitCode -ne 0) {
+        Write-Host $ErrMsg
+        exit
+    }
+}
+
+try {
+    git | Out-Null
+}
+catch [System.Management.Automation.CommandNotFoundException] {
+    Write-Host "Git is not installed, and is required for this script!"
+    exit
+}
+
+Test-Git-Config -Option "user.name" -ErrMsg "Git username not set!`nRun: git config --global user.name 'My Name'"
+Test-Git-Config -Option "user.email" -ErrMsg "Git email not set!`nRun: git config --global user.name 'example@myemail.com'"
+
+$repo_path = "https://github.com/zmkfirmware/zmk-config-split-template.git"
+
+$title = "ZMK Config Setup:"
+$prompt = "Pick an MCU board"
+$options = "nice!nano", "QMK Proton-C", "BlueMicro840 (v1)"
+$boards = "nice_nano", "proton_c", "bluemicro840_v1"
+
+Write-Host "$title"
+Write-Host ""
+Write-Host "MCU Board Selection:"
+
+$choice = Get-Choice-From-Options -Options $options -Prompt $prompt
+$board = $($boards[$choice])
+
+Write-Host ""
+Write-Host "Keyboard Shield Selection:"
+$prompt = "Pick a keyboard"
+
+# TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
+$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "RoMac"
+$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "romac"
+$splits = "y", "y", "y", "y", "y", "y", "n"
+
+$choice = Get-Choice-From-Options -Options $options -Prompt $prompt
+$shield_title = $($options[$choice])
+$shield = $($names[$choice])
+$split = $($splits[$choice])
+
+if ($split -eq "n") {
+    $repo_path = "https://github.com/zmkfirmware/zmk-config-template.git"
+}
+
+$copy_keymap = Read-Host "Copy in the stock keymap for customisation? [Yn]"
+
+if ($copy_keymap -eq "" -or $copy_keymap -eq "Y" -or $copy_keymap -eq "y") {
+    $copy_keymap = "yes"
+}
+
+$github_user = Read-Host "GitHub Username (leave empty to skip GitHub repo creation)"
+
+if ($github_user -ne "") {
+    $repo_name = Read-Host "GitHub Repo Name [zmk-config]"
+
+    if ($repo_name -eq "") {
+        $repo_name = "zmk-config"
+    }
+
+    $github_repo = Read-Host "GitHub Repo [https://github.com/$github_user/$repo_name.git]"
+    
+    if ($github_repo -eq "") {
+        $github_repo = "https://github.com/$github_user/$repo_name.git"
+    }
+}
+else {
+    $repo_name = "zmk-config"
+    $github_repo = ""
+}
+
+Write-Host ""
+Write-Host "Preparing a user config for:"
+Write-Host "* MCU Board: ${board}"
+Write-Host "* Shield: ${shield}"
+
+if ($copy_keymap -eq "yes") {
+    Write-Host "* Copy Keymap?: Yes"
+}
+else {
+    Write-Host "* Copy Keymap?: No"
+}
+
+if ($github_repo -ne "") {
+    Write-Host "* GitHub Repo to Push (please create this in GH first!): $github_repo"
+}
+
+Write-Host ""
+$do_it = Read-Host "Continue? [Yn]"
+
+if ($do_it -ne "" -and $do_it -ne "Y" -and $do_it -ne "y") {
+    Write-Host "Aborting..."
+    exit
+}
+
+git clone --single-branch "$repo_path" "$repo_name"
+Set-Location "$repo_name"
+
+Push-Location config
+
+Invoke-RestMethod -Uri "https://raw.githubusercontent.com/zmkfirmware/zmk/main/app/boards/shields/${shield}/${shield}.conf" -OutFile "${shield}.conf"
+
+if ($copy_keymap -eq "yes") {
+    Invoke-RestMethod -Uri "https://raw.githubusercontent.com/zmkfirmware/zmk/main/app/boards/shields/${shield}/${shield}.keymap" -OutFile "${shield}.keymap"
+}
+
+Pop-Location
+
+$build_file = (Get-Content .github/workflows/build.yml).replace("BOARD_NAME", $board)
+$build_file = $build_file.replace("SHIELD_NAME", $shield)
+$build_file = $build_file.replace("KEYBOARD_TITLE", $shield_title)
+
+if ($board -eq "proton_c") {
+    $build_file = $build_file.replace("uf2", "hex")
+}
+
+Set-Content -Path .github/workflows/build.yml -Value $build_file
+
+Remove-Item -Recurse -Force .git
+git init .
+git add .
+git commit -m "Initial User Config."
+
+if ($github_repo -ne "") {
+    git remote add origin "$github_repo"
+    git push --set-upstream origin $(git symbolic-ref --short HEAD)
+
+    if ($github_repo -imatch "https") {
+        $actions = "$($github_repo.substring(0, $github_repo.length - 4))/actions"
+        Write-Host "Your firmware should be availalbe from the GitHub Actions shortly: $actions"
+    }
+}
diff --git a/docs/static/setup.sh b/docs/static/setup.sh
index 5d203a4..b3c14f7 100644
--- a/docs/static/setup.sh
+++ b/docs/static/setup.sh
@@ -1,14 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
-repo_path="https://github.com/zmkfirmware/zmk-config-split-template.git"
-title="ZMK Config Setup:"
+CheckExists() {
+    command_to_run=$1
+    error_message=$2
+        
+    if ! eval "$command_to_run" &> /dev/null; then
+        printf "%s\n" "$error_message"
+        exit
+    fi
+}
 
+CheckExists "command -v git" "git is not installed, and is required for this script!"
+CheckExists "command -v curl" "curl is not installed, and is required for this script!"
 
-# TODO: Check for git being installed
-# TODO: Check for curl being installed
-# TODO: Check for user.name and user.email git configs being set
+CheckExists "git config user.name" "Git username not set!\nRun: git config --global user.name 'My Name'"
+CheckExists "git config user.email" "Git email not set!\nRun: git config --global user.email 'example@myemail.com'"
+
+repo_path="https://github.com/zmkfirmware/zmk-config-split-template.git"
+title="ZMK Config Setup:"
 
 prompt="Pick an MCU board:"
 options=("nice!nano" "QMK Proton-C" "BlueMicro840 (v1)")
@@ -31,9 +42,6 @@ select opt in "${options[@]}" "Quit"; do
     esac
 done
 
-#read -p "Is this board a complete keyboard [yN]: " complete
-#echo "$complete"
-
 echo ""
 echo "Keyboard Shield Selection:"
 
@@ -67,41 +75,43 @@ if [ "$split" == "n" ]; then
     repo_path="https://github.com/zmkfirmware/zmk-config-template.git"
 fi
 
-read -e -p "Copy in the stock keymap for customization? [Yn]: " copy_keymap
+read -r -e -p "Copy in the stock keymap for customization? [Yn]: " copy_keymap
 
 if [ -z "$copy_keymap" ] || [ "$copy_keymap" == "Y" ] || [ "$copy_keymap" == "y" ]; then copy_keymap="yes"; fi
 
-read -e -p "GitHub Username (leave empty to skip GitHub repo creation): " github_user
+read -r -e -p "GitHub Username (leave empty to skip GitHub repo creation): " github_user
 if [ -n "$github_user" ]; then
-	read -p "GitHub Repo Name [zmk-config]: " repo_name
-	if [ -z "$repo_name" ]; then repo_name="zmk-config"; fi
+    read -r -p "GitHub Repo Name [zmk-config]: " repo_name
+    if [ -z "$repo_name" ]; then repo_name="zmk-config"; fi
 
-	read -p "GitHub Repo [https://github.com/${github_user}/${repo_name}.git]: " github_repo
+    read -r -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
-	repo_name="zmk-config"
+    repo_name="zmk-config"
 fi
 
 echo ""
 echo "Preparing a user config for:"
 echo "* MCU Board: ${board}"
 echo "* Shield: ${shield}"
+
 if [ "$copy_keymap" == "yes" ]; then
     echo "* Copy Keymap?: ✓"
 else
     echo "* Copy Keymap?: ❌"
 fi
+
 if [ -n "$github_repo" ]; then
-	echo "* GitHub Repo To Push (please create this in GH first!): ${github_repo}"
+    echo "* GitHub Repo To Push (please create this in GH first!): ${github_repo}"
 fi
 
 echo ""
-read -p "Continue? [Yn]: " do_it
+read -r -p "Continue? [Yn]: " do_it
 
 if [ -n "$do_it" ] && [ "$do_it" != "y" ] && [ "$do_it" != "Y" ]; then
-	echo "Aborting..."
-	exit
+    echo "Aborting..."
+    exit
 fi
 
 git clone --single-branch $repo_path ${repo_name}
@@ -118,10 +128,10 @@ fi
 popd
 
 sed -i'.orig' \
-	-e "s/BOARD_NAME/$board/" \
-	-e "s/SHIELD_NAME/$shield/" \
-	-e "s/KEYBOARD_TITLE/$shield_title/" \
-	.github/workflows/build.yml
+    -e "s/BOARD_NAME/$board/" \
+    -e "s/SHIELD_NAME/$shield/" \
+    -e "s/KEYBOARD_TITLE/$shield_title/" \
+    .github/workflows/build.yml
 
 if [ "$board" == "proton_c" ]; then
     # Proton-C board still fa
@@ -136,11 +146,11 @@ git add .
 git commit -m "Initial User Config."
 
 if [ -n "$github_repo" ]; then
-	git remote add origin "$github_repo"
-	git push --set-upstream origin $(git symbolic-ref --short HEAD)
+    git remote add origin "$github_repo"
+    git push --set-upstream origin "$(git symbolic-ref --short HEAD)"
 
     # TODO: Support determing the actions URL when non-https:// repo URL is used.
     if [ "${github_repo}" != "${github_repo#https://}" ]; then
-        echo "Your firmware should be available from the GitHub Actions shortly: ${github_url%.git}/actions"
+        echo "Your firmware should be available from the GitHub Actions shortly: ${github_repo%.git}/actions"
     fi
 fi
-- 
cgit v1.2.3


From 550c35db23f15c6835a43fe1d2e4a3b5a04ac2b8 Mon Sep 17 00:00:00 2001
From: CrossR <r.cross@lancaster.ac.uk>
Date: Sun, 20 Sep 2020 12:52:25 +0100
Subject: Fix PR comments, add error checking for push.

---
 docs/static/setup.ps1 | 23 ++++++++++++++++++-----
 docs/static/setup.sh  | 34 +++++++++++++++++++++++-----------
 2 files changed, 41 insertions(+), 16 deletions(-)

(limited to 'docs/static')

diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1
index acda194..a2d66ee 100644
--- a/docs/static/setup.ps1
+++ b/docs/static/setup.ps1
@@ -16,7 +16,7 @@ function Get-Choice-From-Options {
 
         if ($selection -eq $Options.length + 1) {
             Write-Host "Goodbye!"
-            exit
+            exit 1
         }
         elseif ($selection -le $Options.length) {
             $choice = $($selection - 1)
@@ -40,7 +40,7 @@ function Test-Git-Config {
 
     if ($lastExitCode -ne 0) {
         Write-Host $ErrMsg
-        exit
+        exit 1
     }
 }
 
@@ -49,7 +49,7 @@ try {
 }
 catch [System.Management.Automation.CommandNotFoundException] {
     Write-Host "Git is not installed, and is required for this script!"
-    exit
+    exit 1
 }
 
 Test-Git-Config -Option "user.name" -ErrMsg "Git username not set!`nRun: git config --global user.name 'My Name'"
@@ -134,7 +134,7 @@ $do_it = Read-Host "Continue? [Yn]"
 
 if ($do_it -ne "" -and $do_it -ne "Y" -and $do_it -ne "y") {
     Write-Host "Aborting..."
-    exit
+    exit 1
 }
 
 git clone --single-branch "$repo_path" "$repo_name"
@@ -167,10 +167,23 @@ git commit -m "Initial User Config."
 
 if ($github_repo -ne "") {
     git remote add origin "$github_repo"
+
     git push --set-upstream origin $(git symbolic-ref --short HEAD)
 
+    # If push failed, assume that the origin was incorrect and give instructions on fixing.
+    if ($lastExitCode -ne 0) {
+        Write-Host "Remote repository $github_repo not found..."
+        Write-Host "Check GitHub URL, and try adding again."
+        Write-Host "Run the following: "
+        Write-Host "    git remote rm origin"
+        Write-Host "    git remote add origin FIXED_URL"
+        Write-Host "    git push --set-upstream origin $(git symbolic-ref --short HEAD)"
+        Write-Host "Once pushed, your firmware should be availalbe from GitHub Actions at: $actions"
+        exit 1
+    }
+
     if ($github_repo -imatch "https") {
         $actions = "$($github_repo.substring(0, $github_repo.length - 4))/actions"
-        Write-Host "Your firmware should be availalbe from the GitHub Actions shortly: $actions"
+        Write-Host "Your firmware should be availalbe from GitHub Actions shortly: $actions"
     }
 }
diff --git a/docs/static/setup.sh b/docs/static/setup.sh
index b3c14f7..df985a6 100644
--- a/docs/static/setup.sh
+++ b/docs/static/setup.sh
@@ -2,21 +2,21 @@
 
 set -e
 
-CheckExists() {
+check_exists() {
     command_to_run=$1
     error_message=$2
         
     if ! eval "$command_to_run" &> /dev/null; then
         printf "%s\n" "$error_message"
-        exit
+        exit 1
     fi
 }
 
-CheckExists "command -v git" "git is not installed, and is required for this script!"
-CheckExists "command -v curl" "curl is not installed, and is required for this script!"
+check_exists "command -v git" "git is not installed, and is required for this script!"
+check_exists "command -v curl" "curl is not installed, and is required for this script!"
 
-CheckExists "git config user.name" "Git username not set!\nRun: git config --global user.name 'My Name'"
-CheckExists "git config user.email" "Git email not set!\nRun: git config --global user.email 'example@myemail.com'"
+check_exists "git config user.name" "Git username not set!\nRun: git config --global user.name 'My Name'"
+check_exists "git config user.email" "Git email not set!\nRun: git config --global user.email 'example@myemail.com'"
 
 repo_path="https://github.com/zmkfirmware/zmk-config-split-template.git"
 title="ZMK Config Setup:"
@@ -36,8 +36,8 @@ select opt in "${options[@]}" "Quit"; do
     2 ) board="proton_c"; break;;
     3 ) board="bluemicro840_v1"; break;;
 
-    $(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit;;
-    *) echo "Invalid option. Try another one.";continue;;
+    $(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit 1;;
+    *) echo "Invalid option. Try another one."; continue;;
 
     esac
 done
@@ -65,7 +65,7 @@ select opt in "${options[@]}" "Quit"; do
 
     # Add link to docs on adding your own custom shield in your ZMK config!
     # $(( ${#options[@]}+1 )) ) echo "Other!"; break;; 
-    $(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit;;
+    $(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit 1;;
     *) echo "Invalid option. Try another one.";continue;;
 
     esac
@@ -111,7 +111,7 @@ read -r -p "Continue? [Yn]: " do_it
 
 if [ -n "$do_it" ] && [ "$do_it" != "y" ] && [ "$do_it" != "Y" ]; then
     echo "Aborting..."
-    exit
+    exit 1
 fi
 
 git clone --single-branch $repo_path ${repo_name}
@@ -149,8 +149,20 @@ if [ -n "$github_repo" ]; then
     git remote add origin "$github_repo"
     git push --set-upstream origin "$(git symbolic-ref --short HEAD)"
 
+    # If push failed, assume that the origin was incorrect and give instructions on fixing.
+    if [ $? -ne 0 ] {
+        echo "Remote repository $github_repo not found..."
+        echo "Check GitHub URL, and try adding again."
+        echo "Run the following: "
+        echo "    git remote rm origin"
+        echo "    git remote add origin FIXED_URL"
+        echo "    git push --set-upstream origin $(git symbolic-ref --short HEAD)"
+        echo "Once pushed, your firmware should be availalbe from GitHub Actions at: ${github_repo%.git}/actions"
+        exit 1
+    }
+
     # TODO: Support determing the actions URL when non-https:// repo URL is used.
     if [ "${github_repo}" != "${github_repo#https://}" ]; then
-        echo "Your firmware should be available from the GitHub Actions shortly: ${github_repo%.git}/actions"
+        echo "Your firmware should be available from GitHub Actions shortly: ${github_repo%.git}/actions"
     fi
 fi
-- 
cgit v1.2.3


From cd194dbac4747126f017ce6e9ddf070ca6cc1fef Mon Sep 17 00:00:00 2001
From: CrossR <r.cross@lancaster.ac.uk>
Date: Thu, 24 Sep 2020 17:42:34 +0100
Subject:  Add licenses.

---
 docs/static/setup.ps1 |  8 ++++++--
 docs/static/setup.sh  | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'docs/static')

diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1
index a2d66ee..3946e66 100644
--- a/docs/static/setup.ps1
+++ b/docs/static/setup.ps1
@@ -1,3 +1,7 @@
+# Copyright (c) 2020 The ZMK Contributors
+#
+# SPDX-License-Identifier: MIT
+
 $ErrorActionPreference = "Stop"
 
 function Get-Choice-From-Options {
@@ -10,7 +14,7 @@ function Get-Choice-From-Options {
         for ($i = 0; $i -lt $Options.length; $i++) {
             Write-Host "$($i + 1)) $($Options[$i])"
         }
-        
+
         Write-Host "$($Options.length + 1)) Quit"
         $selection = Read-Host $Prompt
 
@@ -103,7 +107,7 @@ if ($github_user -ne "") {
     }
 
     $github_repo = Read-Host "GitHub Repo [https://github.com/$github_user/$repo_name.git]"
-    
+
     if ($github_repo -eq "") {
         $github_repo = "https://github.com/$github_user/$repo_name.git"
     }
diff --git a/docs/static/setup.sh b/docs/static/setup.sh
index df985a6..5bf3645 100644
--- a/docs/static/setup.sh
+++ b/docs/static/setup.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
 
+# Copyright (c) 2020 The ZMK Contributors
+#
+# SPDX-License-Identifier: MIT
+
 set -e
 
 check_exists() {
     command_to_run=$1
     error_message=$2
-        
+
     if ! eval "$command_to_run" &> /dev/null; then
         printf "%s\n" "$error_message"
         exit 1
@@ -28,7 +32,7 @@ echo "$title"
 echo ""
 echo "MCU Board Selection:"
 PS3="$prompt "
-select opt in "${options[@]}" "Quit"; do 
+select opt in "${options[@]}" "Quit"; do
 
     case "$REPLY" in
 
@@ -50,8 +54,8 @@ options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "RoMac")
 
 PS3="$prompt "
 # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
-# select opt in "${options[@]}" "Other" "Quit"; do 
-select opt in "${options[@]}" "Quit"; do 
+# select opt in "${options[@]}" "Other" "Quit"; do
+select opt in "${options[@]}" "Quit"; do
 
     case "$REPLY" in
 
@@ -64,7 +68,7 @@ select opt in "${options[@]}" "Quit"; do
     7 ) shield_title="RoMac" shield="romac"; split="n"; break;;
 
     # Add link to docs on adding your own custom shield in your ZMK config!
-    # $(( ${#options[@]}+1 )) ) echo "Other!"; break;; 
+    # $(( ${#options[@]}+1 )) ) echo "Other!"; break;;
     $(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit 1;;
     *) echo "Invalid option. Try another one.";continue;;
 
@@ -148,9 +152,10 @@ git commit -m "Initial User Config."
 if [ -n "$github_repo" ]; then
     git remote add origin "$github_repo"
     git push --set-upstream origin "$(git symbolic-ref --short HEAD)"
+    push_return_code=$?
 
     # If push failed, assume that the origin was incorrect and give instructions on fixing.
-    if [ $? -ne 0 ] {
+    if [ ${push_return_code} -ne 0 ]; then
         echo "Remote repository $github_repo not found..."
         echo "Check GitHub URL, and try adding again."
         echo "Run the following: "
@@ -159,7 +164,7 @@ if [ -n "$github_repo" ]; then
         echo "    git push --set-upstream origin $(git symbolic-ref --short HEAD)"
         echo "Once pushed, your firmware should be availalbe from GitHub Actions at: ${github_repo%.git}/actions"
         exit 1
-    }
+    fi
 
     # TODO: Support determing the actions URL when non-https:// repo URL is used.
     if [ "${github_repo}" != "${github_repo#https://}" ]; then
-- 
cgit v1.2.3


From 4de7cc45de18f791ecbb361bfc2330a45e97d79e Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Mon, 5 Oct 2020 09:43:05 -0400
Subject: feat(setup): Add M.2 and M60 to setup scripts.

---
 docs/static/setup.ps1 | 10 +++++-----
 docs/static/setup.sh  |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'docs/static')

diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1
index 3946e66..dc7b18c 100644
--- a/docs/static/setup.ps1
+++ b/docs/static/setup.ps1
@@ -63,8 +63,8 @@ $repo_path = "https://github.com/zmkfirmware/zmk-config-split-template.git"
 
 $title = "ZMK Config Setup:"
 $prompt = "Pick an MCU board"
-$options = "nice!nano", "QMK Proton-C", "BlueMicro840 (v1)"
-$boards = "nice_nano", "proton_c", "bluemicro840_v1"
+$options = "nice!nano", "QMK Proton-C", "BlueMicro840 (v1)", "makerdiary nRF52840 M.2"
+$boards = "nice_nano", "proton_c", "bluemicro840_v1", "nrf52840_m2"
 
 Write-Host "$title"
 Write-Host ""
@@ -78,9 +78,9 @@ Write-Host "Keyboard Shield Selection:"
 $prompt = "Pick a keyboard"
 
 # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
-$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "RoMac"
-$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "romac"
-$splits = "y", "y", "y", "y", "y", "y", "n"
+$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "RoMac", "makerdiary M60"
+$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "romac", "m60"
+$splits = "y", "y", "y", "y", "y", "y", "n", "n"
 
 $choice = Get-Choice-From-Options -Options $options -Prompt $prompt
 $shield_title = $($options[$choice])
diff --git a/docs/static/setup.sh b/docs/static/setup.sh
index 5bf3645..9e98964 100644
--- a/docs/static/setup.sh
+++ b/docs/static/setup.sh
@@ -26,7 +26,7 @@ repo_path="https://github.com/zmkfirmware/zmk-config-split-template.git"
 title="ZMK Config Setup:"
 
 prompt="Pick an MCU board:"
-options=("nice!nano" "QMK Proton-C" "BlueMicro840 (v1)")
+options=("nice!nano" "QMK Proton-C" "BlueMicro840 (v1)" "makerdiary nRF52840 M.2")
 
 echo "$title"
 echo ""
@@ -39,6 +39,7 @@ select opt in "${options[@]}" "Quit"; do
     1 ) board="nice_nano"; break;;
     2 ) board="proton_c"; break;;
     3 ) board="bluemicro840_v1"; break;;
+    3 ) board="nrf52840_m2"; break;;
 
     $(( ${#options[@]}+1 )) ) echo "Goodbye!"; exit 1;;
     *) echo "Invalid option. Try another one."; continue;;
@@ -50,7 +51,7 @@ echo ""
 echo "Keyboard Shield Selection:"
 
 prompt="Pick an keyboard:"
-options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "RoMac")
+options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "RoMac" "makerdiary M60")
 
 PS3="$prompt "
 # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
@@ -66,6 +67,7 @@ select opt in "${options[@]}" "Quit"; do
     5 ) shield_title="Sofle" shield="sofle"; split="y"; break;;
     6 ) shield_title="Iris" shield="iris"; split="y"; break;;
     7 ) shield_title="RoMac" shield="romac"; split="n"; break;;
+    7 ) shield_title="M60" shield="m60"; split="n"; break;;
 
     # Add link to docs on adding your own custom shield in your ZMK config!
     # $(( ${#options[@]}+1 )) ) echo "Other!"; break;;
-- 
cgit v1.2.3


From 81a4ffef7efb45f30c74802dca97d949312a1785 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Fri, 9 Oct 2020 15:44:39 -0400
Subject: feat(setup): Add Microdox to setup scripts.

---
 docs/static/setup.ps1 | 6 +++---
 docs/static/setup.sh  | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'docs/static')

diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1
index dc7b18c..abdb698 100644
--- a/docs/static/setup.ps1
+++ b/docs/static/setup.ps1
@@ -78,9 +78,9 @@ Write-Host "Keyboard Shield Selection:"
 $prompt = "Pick a keyboard"
 
 # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
-$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "RoMac", "makerdiary M60"
-$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "romac", "m60"
-$splits = "y", "y", "y", "y", "y", "y", "n", "n"
+$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "RoMac", "makerdiary M60", "Microdox"
+$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "romac", "m60", "microdox"
+$splits = "y", "y", "y", "y", "y", "y", "n", "n", "y"
 
 $choice = Get-Choice-From-Options -Options $options -Prompt $prompt
 $shield_title = $($options[$choice])
diff --git a/docs/static/setup.sh b/docs/static/setup.sh
index 9e98964..49ed3eb 100644
--- a/docs/static/setup.sh
+++ b/docs/static/setup.sh
@@ -51,7 +51,7 @@ echo ""
 echo "Keyboard Shield Selection:"
 
 prompt="Pick an keyboard:"
-options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "RoMac" "makerdiary M60")
+options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "RoMac" "makerdiary M60" "Microdox")
 
 PS3="$prompt "
 # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
@@ -67,7 +67,8 @@ select opt in "${options[@]}" "Quit"; do
     5 ) shield_title="Sofle" shield="sofle"; split="y"; break;;
     6 ) shield_title="Iris" shield="iris"; split="y"; break;;
     7 ) shield_title="RoMac" shield="romac"; split="n"; break;;
-    7 ) shield_title="M60" shield="m60"; split="n"; break;;
+    8 ) shield_title="M60" shield="m60"; split="n"; break;;
+    9 ) shield_title="Microdox" shield="microdox"; split="y"; break;;
 
     # Add link to docs on adding your own custom shield in your ZMK config!
     # $(( ${#options[@]}+1 )) ) echo "Other!"; break;;
-- 
cgit v1.2.3


From 10029c297ed8f6d97b582bc7382d9e9558808884 Mon Sep 17 00:00:00 2001
From: Kellen Carey <kellen.carey@gmail.com>
Date: Fri, 9 Oct 2020 18:00:11 -0700
Subject: exit setup if no write permissions in directory

---
 docs/static/setup.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'docs/static')

diff --git a/docs/static/setup.sh b/docs/static/setup.sh
index 49ed3eb..96e8768 100644
--- a/docs/static/setup.sh
+++ b/docs/static/setup.sh
@@ -22,6 +22,13 @@ check_exists "command -v curl" "curl is not installed, and is required for this
 check_exists "git config user.name" "Git username not set!\nRun: git config --global user.name 'My Name'"
 check_exists "git config user.email" "Git email not set!\nRun: git config --global user.email 'example@myemail.com'"
 
+# Check to see if the user has write permissions in this directory to prevent a cryptic error later on
+if [ ! -w `pwd` ]; then
+    echo 'Sorry, you do not have write permissions in this directory.';
+    echo 'Please try running this script again from a directory that you do have write permissions for.';
+    exit 1
+fi
+
 repo_path="https://github.com/zmkfirmware/zmk-config-split-template.git"
 title="ZMK Config Setup:"
 
-- 
cgit v1.2.3


From b64517943deb3dfe72e2e37ca62319856bc35752 Mon Sep 17 00:00:00 2001
From: Kellen Carey <kellen.carey@gmail.com>
Date: Fri, 9 Oct 2020 18:53:21 -0700
Subject: add powershell check

---
 docs/static/setup.ps1 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'docs/static')

diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1
index abdb698..1da5737 100644
--- a/docs/static/setup.ps1
+++ b/docs/static/setup.ps1
@@ -59,6 +59,19 @@ catch [System.Management.Automation.CommandNotFoundException] {
 Test-Git-Config -Option "user.name" -ErrMsg "Git username not set!`nRun: git config --global user.name 'My Name'"
 Test-Git-Config -Option "user.email" -ErrMsg "Git email not set!`nRun: git config --global user.name 'example@myemail.com'"
 
+$permission = (Get-Acl $PSScriptRoot).Access | 
+?{$_.IdentityReference -match $env:UserName `
+	-and $_.FileSystemRights -match "Read" `
+		-or $_.FileSystemRights -match "Write"	} | 
+			
+		Select IdentityReference,FileSystemRights
+
+If (-Not $permission){
+    Write-Host "Sorry, you do not have write permissions in this directory."
+    Write-Host "Please try running this script again from a directory that you do have write permissions for."
+    exit 1
+}
+
 $repo_path = "https://github.com/zmkfirmware/zmk-config-split-template.git"
 
 $title = "ZMK Config Setup:"
-- 
cgit v1.2.3


From 4aa45c6f40c3e640cebce58b4d10cd24dc61b8ed Mon Sep 17 00:00:00 2001
From: Kellen Carey <kellen.carey@gmail.com>
Date: Sat, 10 Oct 2020 17:00:13 -0700
Subject: update setup.ps1

---
 docs/static/setup.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/static')

diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1
index 1da5737..63bd5c0 100644
--- a/docs/static/setup.ps1
+++ b/docs/static/setup.ps1
@@ -57,11 +57,11 @@ catch [System.Management.Automation.CommandNotFoundException] {
 }
 
 Test-Git-Config -Option "user.name" -ErrMsg "Git username not set!`nRun: git config --global user.name 'My Name'"
-Test-Git-Config -Option "user.email" -ErrMsg "Git email not set!`nRun: git config --global user.name 'example@myemail.com'"
+Test-Git-Config -Option "user.email" -ErrMsg "Git email not set!`nRun: git config --global user.email 'example@myemail.com'"
 
-$permission = (Get-Acl $PSScriptRoot).Access | 
+$permission = (Get-Acl $pwd).Access | 
 ?{$_.IdentityReference -match $env:UserName `
-	-and $_.FileSystemRights -match "Read" `
+	-and $_.FileSystemRights -match "FullControl" `
 		-or $_.FileSystemRights -match "Write"	} | 
 			
 		Select IdentityReference,FileSystemRights
-- 
cgit v1.2.3


From 94bc2c31b14d5ace4c51f409f934ef077323eb32 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Tue, 13 Oct 2020 00:23:25 -0400
Subject: feat: Add a couple missing shields to user setup.

---
 docs/static/setup.ps1 | 6 +++---
 docs/static/setup.sh  | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'docs/static')

diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1
index 63bd5c0..1686be2 100644
--- a/docs/static/setup.ps1
+++ b/docs/static/setup.ps1
@@ -91,9 +91,9 @@ Write-Host "Keyboard Shield Selection:"
 $prompt = "Pick a keyboard"
 
 # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
-$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "RoMac", "makerdiary M60", "Microdox"
-$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "romac", "m60", "microdox"
-$splits = "y", "y", "y", "y", "y", "y", "n", "n", "y"
+$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "RoMac", "RoMac+", "makerdiary M60", "Microdox", "TG4X"
+$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "romac", "romac_plus", "m60", "microdox", "tg4x"
+$splits = "y", "y", "y", "y", "y", "y", "n", "n", "n", "y", "n"
 
 $choice = Get-Choice-From-Options -Options $options -Prompt $prompt
 $shield_title = $($options[$choice])
diff --git a/docs/static/setup.sh b/docs/static/setup.sh
index 96e8768..d7e2b8c 100644
--- a/docs/static/setup.sh
+++ b/docs/static/setup.sh
@@ -58,7 +58,7 @@ echo ""
 echo "Keyboard Shield Selection:"
 
 prompt="Pick an keyboard:"
-options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "RoMac" "makerdiary M60" "Microdox")
+options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "RoMac" "RoMac+" "makerdiary M60" "Microdox" "TG4X")
 
 PS3="$prompt "
 # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
@@ -74,8 +74,10 @@ select opt in "${options[@]}" "Quit"; do
     5 ) shield_title="Sofle" shield="sofle"; split="y"; break;;
     6 ) shield_title="Iris" shield="iris"; split="y"; break;;
     7 ) shield_title="RoMac" shield="romac"; split="n"; break;;
-    8 ) shield_title="M60" shield="m60"; split="n"; break;;
-    9 ) shield_title="Microdox" shield="microdox"; split="y"; break;;
+    8 ) shield_title="RoMac+" shield="romac_plus"; split="n"; break;;
+    9 ) shield_title="M60" shield="m60"; split="n"; break;;
+    10 ) shield_title="Microdox" shield="microdox"; split="y"; break;;
+    11 ) shield_title="TG4X" shield="tg4x"; split="n"; break;;
 
     # Add link to docs on adding your own custom shield in your ZMK config!
     # $(( ${#options[@]}+1 )) ) echo "Other!"; break;;
-- 
cgit v1.2.3


From 43c900f94a9394bc09bdfc646bfd3f42f947d927 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Tue, 13 Oct 2020 19:46:02 -0400
Subject: feat: Add qaz to setup scripts.

---
 docs/static/setup.ps1 | 6 +++---
 docs/static/setup.sh  | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'docs/static')

diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1
index 1686be2..5ebd376 100644
--- a/docs/static/setup.ps1
+++ b/docs/static/setup.ps1
@@ -91,9 +91,9 @@ Write-Host "Keyboard Shield Selection:"
 $prompt = "Pick a keyboard"
 
 # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
-$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "RoMac", "RoMac+", "makerdiary M60", "Microdox", "TG4X"
-$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "romac", "romac_plus", "m60", "microdox", "tg4x"
-$splits = "y", "y", "y", "y", "y", "y", "n", "n", "n", "y", "n"
+$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "RoMac", "RoMac+", "makerdiary M60", "Microdox", "TG4X", "QAZ"
+$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "romac", "romac_plus", "m60", "microdox", "tg4x", "qaz"
+$splits = "y", "y", "y", "y", "y", "y", "n", "n", "n", "y", "n", "n"
 
 $choice = Get-Choice-From-Options -Options $options -Prompt $prompt
 $shield_title = $($options[$choice])
diff --git a/docs/static/setup.sh b/docs/static/setup.sh
index d7e2b8c..e45a7ed 100644
--- a/docs/static/setup.sh
+++ b/docs/static/setup.sh
@@ -58,7 +58,7 @@ echo ""
 echo "Keyboard Shield Selection:"
 
 prompt="Pick an keyboard:"
-options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "RoMac" "RoMac+" "makerdiary M60" "Microdox" "TG4X")
+options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "RoMac" "RoMac+" "makerdiary M60" "Microdox" "TG4X" "QAZ")
 
 PS3="$prompt "
 # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
@@ -78,6 +78,7 @@ select opt in "${options[@]}" "Quit"; do
     9 ) shield_title="M60" shield="m60"; split="n"; break;;
     10 ) shield_title="Microdox" shield="microdox"; split="y"; break;;
     11 ) shield_title="TG4X" shield="tg4x"; split="n"; break;;
+    12 ) shield_title="QAZ" shield="qaz"; split="n"; break;;
 
     # Add link to docs on adding your own custom shield in your ZMK config!
     # $(( ${#options[@]}+1 )) ) echo "Other!"; break;;
-- 
cgit v1.2.3