site, installer: fetch the install scripts from master, not develop (#1087)

The site's one-liners pointed at develop, so any installer change went live
to users the moment it merged, before a release. Point every installer URL at
master: the site's RAW_URL and source links, the README, the scripts' own usage
text, the nightly notes, and install.sh's RAW, which --auto-update re-fetches.

Co-authored-by: Claude Opus 5.5 <[email protected]>

.github/workflows/release.yml

@@ -1037,7 +1037,7 @@ jobs:
             echo
             if [ "$APP_BUILT" = "true" ]; then
               DL="${GITHUB_SERVER_URL}/${REPO}/releases/download/nightly"
-              RAW="https://raw.githubusercontent.com/${REPO}/develop/tools"
+              RAW="https://raw.githubusercontent.com/${REPO}/master/tools"
               echo "### The Virtual Jaguar app (nightly)"
               echo
               echo "The standalone desktop app, built from this same commit. These links always point at the newest nightly."

README.md

@@ -19,10 +19,10 @@ Website, downloads, compatibility and enhancement write-ups: **[jaguar.provenanc
 - **Installer:** one command installs or updates the core, the app, or both, and checks each download against `SHA256SUMS.txt` (read [`tools/install.sh`](tools/install.sh) and [`tools/install.ps1`](tools/install.ps1) first; both take `--dry-run` / `-DryRun` and `--channel nightly` / `-Channel nightly`):
 
   ```sh
-  curl -fsSL https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/develop/tools/install.sh | sh -s -- --what both   # or: --what core | --what app
+  curl -fsSL https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/master/tools/install.sh | sh -s -- --what both   # or: --what core | --what app
   ```
 
-  Windows (PowerShell): `$env:VJ_WHAT = 'both'; irm https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/develop/tools/install.ps1 | iex`
+  Windows (PowerShell): `$env:VJ_WHAT = 'both'; irm https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/master/tools/install.ps1 | iex`
 
 Core release builds cover Linux (x86_64, aarch64, i686, and Raspberry Pi 1, 2, 3, 4 and 5, each with its own CPU-tuned build, plus 64-bit builds for the Pi 3, 4 and 5), macOS (Apple Silicon, Intel), Windows (x64, x86), Android (arm64-v8a, armeabi-v7a, x86_64, x86), iOS (arm64), tvOS (arm64), WebAssembly (Emscripten), PS Vita and Nintendo Switch. The matrix is in [`release.yml`](.github/workflows/release.yml). Other platforms get the core through the libretro buildbot.
 

scripts/build_site.py

@@ -59,8 +59,9 @@ MAKEFILE = ROOT / "Makefile"
 REPO_URL = "https://github.com/libretro/virtualjaguar-libretro"
 # raw.githubusercontent for the install one-liner; derived from REPO_URL so a
 # fork or rename cannot leave the curl command pointing at the wrong repo.
+# master, not develop: users get the released installer, not unreleased edits.
 RAW_URL = REPO_URL.replace("https://github.com/",
-                           "https://raw.githubusercontent.com/") + "/develop"
+                           "https://raw.githubusercontent.com/") + "/master"
 
 # The canonical base for every absolute URL the site emits; for a given page
 # the <link rel=canonical>, og:url and the sitemap <loc> must come out

site/pages/index.html

@@ -180,9 +180,9 @@
       <code>&amp; ([scriptblock]::Create((irm {{RAW_URL}}/tools/install.ps1))) -What both</code>.
     </p>
     <p class="footnote">
-      <a href="{{REPO}}/blob/develop/tools/install.sh"><code>install.sh</code></a>
+      <a href="{{REPO}}/blob/master/tools/install.sh"><code>install.sh</code></a>
       (Linux, Raspberry Pi, macOS) and
-      <a href="{{REPO}}/blob/develop/tools/install.ps1"><code>install.ps1</code></a>
+      <a href="{{REPO}}/blob/master/tools/install.ps1"><code>install.ps1</code></a>
       (Windows) take <code>--dry-run</code> / <code>-DryRun</code> to print the
       plan and change nothing, and <code>--channel nightly</code> /
       <code>-Channel nightly</code>. The app goes to <code>/Applications</code>

tools/install.ps1

@@ -8,13 +8,13 @@
 
   Run it straight from the web (read it first if you like):
 
-    irm https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/develop/tools/install.ps1 | iex
+    irm https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/master/tools/install.ps1 | iex
 
   `iex` cannot pass arguments, so configure that form with environment variables
   (VJ_WHAT, VJ_CHANNEL, VJ_YES, VJ_DRYRUN, VJ_CORE_DIR, VJ_APP_DEST,
   VJ_APP_FORMAT, VJ_FORCE) -- or hand the script block its parameters:
 
-    & ([scriptblock]::Create((irm https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/develop/tools/install.ps1))) -What both -DryRun
+    & ([scriptblock]::Create((irm https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/master/tools/install.ps1))) -What both -DryRun
 
   What it does
     core  finds RetroArch (registry, common folders, retroarch.cfg), reads the

tools/install.sh

@@ -6,7 +6,7 @@
 #
 # POSIX sh.  Runs under sh, bash, zsh, dash, busybox ash.  Safe to pipe:
 #
-#   curl -fsSL https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/develop/tools/install.sh | sh
+#   curl -fsSL https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/master/tools/install.sh | sh
 #
 # Piping into a shell means stdin is the script, so prompts read /dev/tty
 # instead.  Where there is no tty (CI, a pipe with no terminal) the script goes
@@ -76,7 +76,8 @@
 set -eu
 
 REPO="libretro/virtualjaguar-libretro"
-RAW="https://raw.githubusercontent.com/$REPO/develop/tools/install.sh"
+# master = the released installer; --auto-update re-fetches this URL.
+RAW="https://raw.githubusercontent.com/$REPO/master/tools/install.sh"
 BASE="${VJ_INSTALL_BASE_URL:-https://github.com/$REPO/releases}"
 BASE="${BASE%/}"
 CORE_NAME="virtualjaguar_libretro"
@@ -200,7 +201,7 @@ Virtual Jaguar -- installer / updater for the RetroArch core and the app.
 
 Piped into a shell, prompts read /dev/tty; with no tty it takes defaults.
 Windows: use install.ps1.  Download this script and read it first if you like:
-  curl -fLO https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/develop/tools/install.sh
+  curl -fLO https://raw.githubusercontent.com/libretro/virtualjaguar-libretro/master/tools/install.sh
 USAGE
   fi
   exit 0
@@ -882,7 +883,7 @@ app_install() {
       ;;
     MINGW*|MSYS*|CYGWIN*)
       die "this is a Windows shell.  Use install.ps1 in PowerShell instead:
-       irm https://raw.githubusercontent.com/$REPO/develop/tools/install.ps1 | iex" ;;
+       irm https://raw.githubusercontent.com/$REPO/master/tools/install.ps1 | iex" ;;
     *) die "unsupported OS '$OS' for the app (macOS and Linux; Windows is install.ps1)." ;;
   esac