From ce180f1bbbef322c0b53159d3d3e8052e2155311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lison=20Fernandes?=
 <vvolkgang@users.noreply.github.com>
Date: Thu, 31 Oct 2024 10:43:41 +0000
Subject: [PATCH] [PM-14261] Update README and bugs template to remove Beta
 references (#4198)

---
 .github/ISSUE_TEMPLATE/bug.yml | 30 ++++++++-------
 README.md                      |  5 +--
 scripts/download-artifacts.sh  | 69 ++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 17 deletions(-)
 create mode 100755 scripts/download-artifacts.sh

diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index f12fda561..d24ccaa12 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,4 +1,4 @@
-name: Android Beta Bug Report
+name: Android Bug Report
 description: File a bug report
 labels: [ bug ]
 body:
@@ -7,19 +7,7 @@ body:
       value: |
         Thanks for taking the time to fill out this bug report!
 
-        > [!WARNING]
-        > This is the new native Bitwarden Beta app repository. For the publicly available apps in App Store / Play Store, submit your report in [bitwarden/mobile](https://github.com/bitwarden/mobile)
-
-
         Please do not submit feature requests. The [Community Forums](https://community.bitwarden.com) has a section for submitting, voting for, and discussing product feature requests.
-  - type: checkboxes
-    id: beta
-    attributes:
-      label: Bitwarden Beta
-      options:
-        - label: "I'm using the new native Bitwarden Beta app and I'm aware that legacy .NET app bugs should be reported in [bitwarden/mobile](https://github.com/bitwarden/mobile)"
-    validations:
-      required: true
   - type: textarea
     id: reproduce
     attributes:
@@ -63,6 +51,22 @@ body:
       description: What version of our software are you running?
     validations:
       required: true
+  - type: dropdown
+    id: server-region
+    attributes:
+      label: What server are you connecting to?
+      options:
+        - US
+        - EU
+        - Self-host
+        - N/A
+    validations:
+      required: true
+  - type: input
+    id: server-version
+    attributes:
+      label: Self-host Server Version
+      description: If self-hosting, what version of Bitwarden Server are you running?
   - type: textarea
     id: environment-details
     attributes:
diff --git a/README.md b/README.md
index 8b8874249..353b4a103 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,4 @@
-# Bitwarden Android (BETA)
-
-> [!TIP]
-> This repo has the new native Android app, currently in [Beta](https://community.bitwarden.com/t/about-the-beta-program/39185). Looking for the legacy .NET MAUI apps? Head on over to [bitwarden/mobile](https://github.com/bitwarden/mobile)
+# Bitwarden Android
 
 ## Contents
 
diff --git a/scripts/download-artifacts.sh b/scripts/download-artifacts.sh
new file mode 100755
index 000000000..0d8a8fbff
--- /dev/null
+++ b/scripts/download-artifacts.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+# Download Artifacts Script
+#
+# This script downloads build artifacts from a GitHub Actions run and processes them
+# for consistent naming. It requires:
+#   - GitHub CLI (gh) to be installed and authenticated
+#   - Two arguments:
+#     1. Target path where artifacts should be downloaded
+#     2. GitHub Actions run ID to download artifacts from
+#
+# Example usage:
+#   ./download-artifacts.sh 2024.10.2 1234567890
+#
+# The script will:
+# 1. Create the target directory if it doesn't exist
+# 2. Download all artifacts from the specified GitHub Actions run
+# 3. Process the artifacts to have consistent naming based on their folders
+# 4. Move artifacts up to the target path
+
+# Check if required arguments are provided
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <path> <github_run_id>"
+    exit 1
+fi
+
+# Store arguments
+TARGET_PATH="$1"
+GITHUB_RUN_ID="$2"
+
+# Create target directory if it doesn't exist
+mkdir -p "$TARGET_PATH"
+
+# Change to target directory
+cd "$TARGET_PATH" || exit 1
+
+# Download artifacts using GitHub CLI
+echo "Downloading artifacts from GitHub run $GITHUB_RUN_ID..."
+gh run download "$GITHUB_RUN_ID"
+
+# Process downloaded artifacts
+for dir in */; do
+    # Skip if no directories found
+    [ -e "$dir" ] || continue
+
+    # Remove trailing slash from directory name
+    dirname=${dir%/}
+
+    # First rename all files inside directory with directory name prefix
+    for file in "$dir"*; do
+        # Skip if no files found
+        [ -e "$file" ] || continue
+
+        # Get just the filename without path
+        filename=$(basename "$file")
+        # Get just the directory name without path
+        foldername=$(basename "$dirname")
+        # Rename file with directory name prefix
+        mv "$file" "$dir${foldername}"
+    done
+
+    # Rename directory to avoid collision with files
+    mv "$dir" "${dirname}_temp"
+
+    # Move all files up from renamed directory
+    mv "${dirname}_temp"/* .
+
+    # Remove empty directory
+    rmdir "${dirname}_temp"
+done