Fixes PATH variance, filename replacement script (#10706)

Fixes #10662

Author: atsansone

src/_data/shells.yml

@@ -1,14 +1,14 @@
 - name: bash
-  set-path: echo 'export PATH="$HOME/development/flutter/bin:$PATH"' >> ~/.bash_profile
+  set-path: echo 'export PATH="/usr/bin/flutter/bin:$PATH"' >> ~/.bash_profile
 - name: zsh
-  set-path: echo 'export PATH="$HOME/development/flutter/bin:$PATH"' >> ~/.zshenv
+  set-path: echo 'export PATH="/usr/bin/flutter/bin:$PATH"' >> ~/.zshenv
 - name: fish
-  set-path: fish_add_path -g -p $HOME/development/flutter/bin
+  set-path: fish_add_path -g -p /usr/bin/flutter/bin
 - name: csh
-  set-path: echo 'setenv PATH "$HOME/development/flutter/bin:$PATH"' >> ~/.cshrc
+  set-path: echo 'setenv PATH "/usr/bin/flutter/bin:$PATH"' >> ~/.cshrc
 - name: tcsh
-  set-path: echo 'setenv PATH "$HOME/development/flutter/bin:$PATH"' >> ~/.tcshrc
+  set-path: echo 'setenv PATH "/usr/bin/flutter/bin:$PATH"' >> ~/.tcshrc
 - name: ksh
-  set-path: echo 'export PATH="$HOME/development/flutter/bin:$PATH"' >> ~/.profile
+  set-path: echo 'export PATH="/usr/bin/flutter/bin:$PATH"' >> ~/.profile
 - name: sh
-  set-path: echo 'export PATH="$HOME/development/flutter/bin:$PATH"' >> ~/.profile
+  set-path: echo 'export PATH="/usr/bin/flutter/bin:$PATH"' >> ~/.profile

src/_includes/docs/install/flutter/download.md

@@ -8,17 +8,17 @@
    {% assign path='C:\\user\\{username}\\dev' %}
    {% assign flutter-path='C:\\user\\{username}\\dev\\flutter' %}
    {% assign terminal='PowerShell' %}
-   {% assign prompt='C:>' %}
+   {% assign prompt='PS C:\\>' %}
    {% assign prompt2=path | append: '>' %}
    {% assign diroptions='`%USERPROFILE%` (`C:\\Users\\{username}`) or `%LOCALAPPDATA%` (`C:\\Users\\{username}\\AppData\\Local`)' %}
    {% assign dirinstall='`%USERPROFILE%\\dev\\`' %}
    {% assign dirdl='%USERPROFILE%\\Downloads' %}
    {% assign ps-dir-dl='$env:USERPROFILE\\Downloads\\' %}
    {% assign ps-dir-target='$env:USERPROFILE\\dev\\' %}
-   {% capture uz -%}
-   {{prompt}} Expand-Archive `
-       –Path {{ps-dir-dl}}flutter_sdk_v1.0.0.zip `
-       -Destination {{ps-dir-target}}
+   {% capture uz %}
+     {{prompt}} Expand-Archive `
+         –Path {{ps-dir-dl}}flutter_sdk_v1.0.0.zip `
+         -Destination {{ps-dir-target}}
    {%- endcapture %}
 {% when "macOS" -%}
    {% assign diroptions='`~/development/`' %}
@@ -27,11 +27,11 @@
    {% assign path='~/development/' %}
    {% assign flutter-path='~/development/flutter' %}
    {% assign terminal='the Terminal' %}
-   {% assign prompt='$' %}
+   {% assign prompt='\$' %}
    {% assign dirdl='~/Downloads/' %}
    {% capture uz -%}
-   {{prompt}} {{unzip}} {{dirdl}}flutter_sdk_v1.0.0.zip \
-        -d {{path}}
+      {{prompt}} {{unzip}} {{dirdl}}flutter_sdk_v1.0.0.zip \
+          -d {{path}}
    {%- endcapture %}
 {% else -%}
    {% assign diroptions='`/usr/bin/`' %}
@@ -40,11 +40,10 @@
    {% assign path='/usr/bin/' %}
    {% assign flutter-path='/usr/bin/flutter' %}
    {% assign terminal='a shell' %}
-   {% assign prompt='$' %}
+   {% assign prompt='\$' %}
    {% assign dirdl='~/Downloads/' %}
    {% capture uz -%}
-   {{prompt}} {{unzip}} -xf {{dirdl}}flutter_sdk_v1.0.0.zip \
-        -C {{path}}
+     {{prompt}} {{unzip}} -xf {{dirdl}}flutter_sdk_v1.0.0.zip -C {{path}}
    {%- endcapture %}
 {% endcase -%}
 

src/content/assets/js/archive.js

@@ -4,7 +4,8 @@ const releasesToShow = 99999;
 // The Flutter SDK archive filename prefix.
 const FILE_NAME_PREFIX = 'flutter_';
 
-const filenameReplacement = new RegExp(`^(.*) (.*?)\\b${FILE_NAME_PREFIX}\\w+_v?[X|0-9]+\\..* (.*)`, 'm');
+const filenameReplacement = new RegExp(`^(.*)(\\bflutter_\\w+_v?([X|0-9]\\.)+[zipxztar\\.]{2,3})`, 'm');
+// const filenameReplacement = new RegExp(`^((.*) )* (.*?)\\b${FILE_NAME_PREFIX}\\w+_v?[X|0-9]+\\..* (.*)`, 'm');
 // const filenameReplacement = new RegExp(`^(.*?)\\b{FILE_NAME_PREFIX}\\w+_v?([X|0-9]+\\.)+[zip|tar\\.xz](.*)$`, 'm');
 // const filenameReplacement = new RegExp(`\\b{FILE_NAME_PREFIX}\\w+_v?\\d+(\\.\\d+)+\\.(zip|tar\\.xz)\\b`, 'm');
 
@@ -164,23 +165,23 @@ function replaceFilenameInCodeElements(archiveFilename) {
 
   codeElements.forEach((codeElement) => {
     // Check if the <code> element itself needs replacement
-    const codeElementText = codeElement.textContent;
+    const codeElementText = codeElement.innerHTML;
     if (codeElementText.includes(FILE_NAME_PREFIX) &&
         filenameReplacement.test(codeElementText)) {
-      codeElement.textContent = codeElementText.replace(
+      codeElement.innerHTML = codeElementText.replace(
         filenameReplacement,
-        `$1 $2${archiveFilename} $3`
+        `$1${archiveFilename}`
       );
     }
 
     // Process child nodes as before 
     codeElement.childNodes.forEach((node) => {
       const nodeText = node.textContent;
-      if (node.nodeType === Node.ELEMENT_NODE &&
+      if (node.nodeType === Node.TEXT_NODE &&
           nodeText.includes(FILE_NAME_PREFIX)) {
         node.textContent = nodeText.replace(
           filenameReplacement,
-          `$1 $2${archiveFilename} $3`
+          `$1${archiveFilename}`
         );
       }
     });