Merge branch 'master' into develop

seriema · Mar 29, 2020 · 1c46f12 · 1c46f12
2 parents 43f45d9 + 82a902b
commit 1c46f12
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -17,9 +17,11 @@ An expensive and over-engineered approach to storing ROMs and their metadata whi
 1. Install Retro-Cloud on the Raspberry Pi (creates the VM for step 2):
 
     ```bash
-    $ curl -sSL https://raw.githubusercontent.com/seriema/retro-cloud/develop/raspberry-pi/download-and-run.sh | bash
+    $ curl -sSL https://raw.githubusercontent.com/seriema/retro-cloud/master/raspberry-pi/download-and-run.sh | bash
     # Or this shortened URL:
     $ curl -sSL https://tiny.cc/retro-cloud-setup | bash
+    # Or get the latest development version:
+    $ curl -sSL https://tiny.cc/rc-rpi | bash
     ```
 
     > **NOTE!** You will be prompted to log into your Azure account. The script pauses with the message:
@@ -36,9 +38,11 @@ An expensive and over-engineered approach to storing ROMs and their metadata whi
     * On the VM. Log into the VM from the RPi with `$ bash -i ssh-vm.sh`, or any other way you want, and then run:
 
         ```bash
-        $ curl -sSL https://raw.githubusercontent.com/seriema/retro-cloud/develop/virtual-machine/setup.sh | bash
+        $ curl -sSL https://raw.githubusercontent.com/seriema/retro-cloud/master/virtual-machine/setup.sh | bash
         # Or this shortened URL:
         $ curl -sSL https://tiny.cc/retro-cloud-setup-vm | bash
+        # Or get the latest development version:
+        $ curl -sSL https://tiny.cc/rc-vm | bash
         ```
 
 1. Copy ROMs to Azure File Share. Alternatives:

diff --git a/raspberry-pi/download-and-run.sh b/raspberry-pi/download-and-run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Script takes optional parameter for branch name or commit hash.
-branch=${1:-develop}
+branch=${1:-master}
 
 # Abort on error, and error if variable is unset
 set -eu

diff --git a/raspberry-pi/local/setup-vm.sh b/raspberry-pi/local/setup-vm.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Script takes optional parameter for branch name or commit hash.
-branch=${1:-develop}
+branch=${1:-master}
 
 # Abort on error, and error if variable is unset
 set -eu

diff --git a/virtual-machine/setup.sh b/virtual-machine/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Script takes optional parameter for branch name or commit hash.
-branch=${1:-develop}
+branch=${1:-master}
 
 # Abort on error
 set -e