Fix service worker error, update deploy script

3 files changed, 16 insertions, 5 deletions

diff --git a/deploy.sh b/deploy.sh
index 81f23ce..9b8ab74 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -53,13 +53,24 @@ git add .
 git commit -m ":rocket: Deploy app v$VERSION"
 
 tput setaf 4
-echo "> Return to controller branch and tag last commit"
+<<<<<<< Updated upstream
+echo "> Return to main branch and tag last commit"
 tput sgr0
 
-git checkout controller
+git checkout main
 
 #git tag "v$VERSION"
 
-git push -f origin controller
+git push -f origin main
+=======
+echo "> Return to main branch and tag last commit"
+tput sgr0
+
+git checkout main
+
+#git tag "v$VERSION"
+
+git push -f origin main
+>>>>>>> Stashed changes
 #git push origin "v$VERSION"
 git push origin gh-pages
diff --git a/src/js/main.js b/src/js/main.js
index 801a9eb..3a6f9e9 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -6,7 +6,7 @@ import { Gamepad } from './gamepad';
 let sw = "service-worker.js";
 if (navigator.serviceWorker) {
     navigator.serviceWorker.register(
-        sw, {scope: '/hoverbit-ble/'}
+        sw, {scope: '/microbit-gamepad/'}
     ).then(registration => {
         registration.onupdatefound = () => {
             const installingWorker = registration.installing;
diff --git a/src/service-worker.js b/src/service-worker.js
index 96accb3..112a0e7 100644
--- a/src/service-worker.js
+++ b/src/service-worker.js
@@ -1,4 +1,4 @@
-var APP_PREFIX = 'hoverbitcontroller'     // Identifier for this app (this needs to be consistent across every cache update)
+var APP_PREFIX = 'microbitgamepad'     // Identifier for this app (this needs to be consistent across every cache update)
 var VERSION = '{{ VERSION }}'              // Version of the off-line cache (change this value everytime you want to update cache)
 var CACHE_NAME = APP_PREFIX + VERSION
 var URLS = ["{{ CACHE_FILES }}"]  // This will be replaced by the deploy-script